In this 35 minute livestream recording, I commit conflicting code to a Git repo in Azure DevOps Services using Redgate’s SQL Source Control, then step through options to fix the conflict.

We first run through an example where we hit a conflict when pushing to the master branch and resolve that. Then we run through an example where we are using a feature branch and identify the conflict when doing a pull request to merge the change into master.

Resources to Follow Along

• SQL Source Control is part of Redgate’s SQL Toolbelt. It is not free, but we have a free trial. If you don’t need automated build and deployments, you can also purchase SQL Source Control individually.
• The Northwind database is shared by Microsoft under the MIT License on GitHub
• I use the Sublime Merge editor in this demo to resolve the conflict. You can try that out for free at https://www.sublimemerge.com