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!

_______________________________

Hit like and subscribe for more content! :D

You can also follow me on the other platforms:

_______________________________
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

_______________________________

#vscode #visualstudiocode #merge

[DevLeonardo]

Thanks for watching this video! My name is Leonardo and I talk about Web Development and Open Source. If you liked this video, check out my channel and Subscribe! See you in the next one ❤

[ralph]

Visual studio 2022 has the better option of fixing merge conflicts. They have the check boxes there that automatically adds changes to the next line if you accept both. Hoping vs code make that

[aaronk]

Thank u bro. I have been avoiding resolving merge conflicts at my internship until this vid 😅

[oltqhws]

Maan amazing video, you explain everything in detail and you help me so much, your channel deserve to have many more subs and and I wish you that, keep it up! Big greeting from Serbia! :)

[fredwoolf]

Great explanation! You explain things very thoroughly.

[mathewshaker]

Awesome video. Very well put together. Thanks so much man

[LayronPK]

Man, that helped a lot! Thanks for the vid)

[jaqb_]

Helped me with that abort merge option, that i was looking in UI
thanks

[DevLeonardo]

Which one do you like the most? Old inline UI or the new three-way editor?

Thank you ever so much. Sort and useful.

I do not have the instruction Git Abort Merge, I do have Git clone, Git merge, etc. Do you know if I need to install or activate anything else?

Thank you in advance

[megasuperlexa]

in a 3-way merge I should be able to see: base version, my changes, conflicting changes, result. 4 windows. Here, only 3 windows - wtf?

[erikanders]

Looks like it is not a 3 Way Merge. Currently I am looking for a 3 Way merge with Base, Version1, Version2 and Automerge like K3Diff but could not find anything so far for VSCODE.

[celvis]

bro what the hell is Merge branch 'main' of this is pissing me off so badly