The EXTREMELY helpful guide to merge conflicts

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

[peabnuts]

I spent years thinking "isn't there some information I'm missing here??" before I discovered git's `diff3` conflict style. It's insane to me that git just shows you the result of each change (not what it was beforehand) by default. I don't know how anybody is merging anything like that. Vscode's merge tool makes this even easier 👍 I've been very excited seeing it roll into the product, knowing "proper" merge conflict resolution will be available to so many people now! I just wish the base view was enabled by default.

[markvogt]

You EARNED A NEW SUBSCRIBER from this immensely-useful (and timely!) video !
Well done you!

-Mark in North Aurora IL

[hemanthkumartirupati]

Thank you Vscode team. These videos are extremely helpful. Keep making technical/educational videos

[phatdad]

I can't tell you how many years I have tried or wanted to learn how to program just even the simplest of code but between just the terminology and gooeys of everything altogether it was such a whirlwind I could never wrap my head around it and by anytime I started making some progress whatever free trials cider video I was watching hit a massive pay wall and it was generally after hours of hard work and at that point you barely learned anything and you want to punch yourself in the mouth. What he just taught me in the last two lessons or only two lessons of this beginner tutorial for visual studio code and GitHub is it literally she'll shocking me right now in a great way and also quite a face-palming way as well as I think back of all the years of things are now making sense to me and what went wrong all those times I don't even know who to thank or how many times I could thank them for creating this video and putting it in whatever search terminology seoi happen to type today but just know I do and I'm pretty sure that feeling will grow exponentially

[jscobie]

Just learning how to turn on the base window was worth its weigh in gold. I can't believe I've missed that all this time.

[valp_co]

I love this kinda of content, being able to smootly go over git, allow me to go faster and confident.
thanks for this content, great job.

[RichardNobel]

queue 🎵 Meghan Trainor — All About That -Bass- *BASE* 😉 ( 4:18 in the video )

On topic: VS Code keeps getting better! Thanks for pointing out the "Show Base" and "Accept Combination" features. 👍

[PeterNeave]

I'm always amazed what VS Code can do. Can it resolve other types of conflicts? tabs vs spaces, blonds vs brunettes, Ukraine vs Russia, etc?

[WaldirPimenta]

I'm pretty comfortable with using git on the terminal, but the new "Accept Combination" feature has been very helpful so far! It does feel a bit magical and I keep double-checking its results to make sure it didn't mess up, but I guess git's own automatic conflict resolution is already a piece of "magic" that I accept, so it's only fair that this is merely an extension of that. I hope this work can be upstreamed back to git!

[DevLeonardo]

I released a video about how to handle a conflict on vscode like... last week! But I didn't know we had the base branch view. Thanks for sharing!
Good thing that I already have a wide monitor to fit all those panels 😅

[planetoftheweb]

Well done video bud. Love the stickies! The new Merge tool is one of the best additions to VS code in a long time.

[bsewall]

Makes it so much simpler! Thanks for the tip!

[tharinda]

The one that pulled the triggers for me. Well explained! 🙏

[attilapinter]

Yep, exactly the type of parties we have at the openSUSE Bar so thanks for the ammo ^-^

[martin]

The title of this video is actually justified. It IS extremely helpful.👍

[SJMilnor]

Thanks! Those notecards with shapes on them representing commits were a great illustration.

[psr-pkdb]

Thanks a lot.. now my issue is resolved and understood the merge-conflict concept well.

[halopinx]

From a webstorm ide I need to change to VS Code. This explains very well on how to merge conflicts on VSCode. Thank you!

[bslayerw]

I also like these short bit sized videos that I don't have to set 30 minutes or more aside for.

[YiuMingLai]

yes, very useful feature I have been rebasing my code change every day waiting for code review.