Resolving Merge Conflicts in SQL Source Control – the Basics (video)

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.

To follow along with this demo yourself…

Previous Post
Why You Should Take the 2020 State of Database DevOps Survey today (video)
Next Post
Why I’m Learning Git via the Command Line Interface

Related Posts

No results found

Leave a Reply

This site uses Akismet to reduce spam. Learn how your comment data is processed.