Resolve Merge Conflict in Visual Studio Code

Got a merge Conflict after doing git pull or merge? Visual Studio Code can help you! Twice! There are mainly two different ways of handling conflicts on vscode, inline or three-way. I will show you both so you can decide which one you like the most! _______________________________ Support my work: https://github.com/sponsors/Balastrong Hit like and subscribe for more content! :D Join the Discord community! Here's the invite: https://discord.gg/Gtzcg4sggn You can also follow me on the other platforms: Twitter: https://twitter.com/Balastrong TikTok: https://www.tiktok.com/@balastrong dev.to: https://dev.to/balastrong GitHub: https://github.com/Balastrong Instagram: https://www.instagram.com/devbalastrong/ _______________________________ TIMESTAMPS 00:00 Two possible solutions 00:29 Inline editor 01:31 Inline editor - Advanced 02:36 Three-way editor 04:23 Three-way editor - Advanced 05:02 Continue after a conflict 05:37 Restart the merge 06:02 Improve the UI _______________________________ Sound effects from https://www.zapsplat.com #vscode #visualstudiocode #merge