Sign in to confirm you’re not a bot
This helps protect our community. Learn more

The EXTREMELY helpful guide to merge conflicts

Visual Studio Code
751K subscribers
<__slot-el>
<__slot-el>
159K views 2 years ago #coding #git #vscode
VS Code's new merge editor interface gives you the view you've been missing for easily resolving merge conflicts. 00:00 - Intro 00:30 - What is a merge conflict? 01:00 - "Base", explained 02:18 - Simple merge conflict 03:00 - When merge conflicts get complicated 03:34 - Introducing the new Merge Editor 04:19 - Showing the base 04:30 - Comparing changes with the base 05:15 - Resolving the conflicts 07:10 - Getting back to the default merge experience 07:35 - A 3 way merge #vscode, #git, #coding ...more
...more
The EXTREMELY helpful guide to merge conflicts
4.6KLikes
159,728Views
2022Dec 6
VS Code's new merge editor interface gives you the view you've been missing for easily resolving merge conflicts. 00:00 - Intro 00:30 - What is a merge conflict? 01:00 - "Base", explained 02:18 - Simple merge conflict 03:00 - When merge conflicts get complicated 03:34 - Introducing the new Merge Editor 04:19 - Showing the base 04:30 - Comparing changes with the base 05:15 - Resolving the conflicts 07:10 - Getting back to the default merge experience 07:35 - A 3 way merge #vscode, #git, #coding

Follow along using the transcript.

Visual Studio Code

751K subscribers