SQL Source Control and VSCode: Handling Git Conflicts
Redgate's Kendra Little demonstrates what conflicts look like in SQL Source Control, and how you may handle these conflicts using free tools in VSCode. In VSCode we show the native Git plugin as well as the free GitLens extension. Chapters:
00:00 Overview of the demo setup
02:07 Demo begins of a merge conflict when working in the same branch as your teammates
03:17 Why conflicts occur as interrupts if we work in the same branch in Git
04:35 Interpreting Git conflict messages in SQL Source Control
05:58 Resolving a merge conflict within your current branch
08:37 Why working in private feature branches is a common practice for Git users
10:42 Traveling back in time with the GitLens extension
12:07 Resetting SQL Source Control after resetting in Git
14:30 Demo begins of working in a feature branch in SQL Source Control, and proactively merging from main when we're ready
15:17 Checking out a new branch in VSCode
18:18 Merge changes from the upstream main branch into our feature branch. Note: I have enabled VSCode to regularly fetch changes for me so I haven't manually 'fetched'
20:38 Resolving the conflict in VSCode
23:40 Staging and committing to complete the merge
25:05 Applying changes we made in VSCode to our dev database in SQL Source Control
26:06 Pushing our changes to the central Git repo and creating a Pull Request
29:00 Approving and completing the Pull Request
*********************
Tools shown
*********************
* SQL Source Control - https://www.red-gate.com/products/sql...
* Git (free)- https://git-scm.com/
* VSCode (free) - https://code.visualstudio.com/
* GitLens extension for VSCode (free) - https://marketplace.visualstudio.com/...
* Azure DevOps - https://dev.azure.com/
*********************
More learning
*********************
Dig into how SQL Source Control works behind the scenes: https://documentation.red-gate.com/so...