IntelliJ IDEA: Resolving Merge Conflicts in Git

When you work in a team, you may come across a situation when somebody pushes changes to a file you are currently working on. If these changes do not overlap, the conflicting files are merged automatically. However, if the same lines were affected, Git cannot randomly pick one side over the other, and asks you to resolve the conflict.
In this screencast, we're going to take a look at resolving merge conflicts.

*Author: Marit van Dijk

Join us:

#intelliJIDEA #intelliJ #jetbrains #java #programming

[GakisStylianos]

People often find it weird that I actually enjoy resolving conflicts. Little do they know I enjoy it because I'm using the JetBrains integration 😅

[zafarparvez]

Never seen conflict resolution with such ease.

[aswarthanarayanareddyb]

Great Tutorial. Actually I don't know how to re open the conflicts window again. Now I got know. Thanks a lot

[giriNITT]

I am already using intellij to resolve merge conflicts. But today i learnt how to open the conflict window if i closed it by mistake

[Sogdo]

Never seen conflict resolution with such ease.
Jiobyte Team.

[govindgupta]

Thanks for explaining so nicely. It was such a strugle for me to understand that 3 window thing. Thanks so much

[rohitbhanot]

Honestly Git integration in JB IDEs is just amazing, vsCode is still trying to reach to a point where its feature rich while not being clunky at the same time.

[wilfredkigenyi]

This is so cool. I was expecting a very long story.

[idontusenumbers]

The demo was missing the best feature: Magic Wand!

[guyshalev]

Great video!, could you show next video about cherry picking?

[scottbeale]

So how do I manage merge conflicts if I'm not using your tool?? I'm using command line

[isqnspx]

Hi. Will this method have resolved a PR in the GitHub webpage?

[majnoun-jeddaan]

Your resolution needs a resolution. Sorry but it is incomplete and confusing

[kitersrefuge]

The issue with this content is the unmentioned "pre-requisite". If the viewer cannot interpret the visual representation of the branches and their commits in the main Git windows (in the middle) he/she has not a hells chance in applying this valuable content. The main windows with its tags is confusing as heck. It would be better to have a roadmapped series of presentations (most probably there is another somewhere) where the pre-requisite presentation exists; JetBrains: great products, very poor doco and fragmented incoherent videos, attempting piecemeal to outline an insanely feature rich Intellij IDEA. I am 100% sure, having worked with the tool for years, I have only touched the surface of its capabilities, because of the latter. Its like owning a Tesla, but only knowing the basics in its interface. Great shame. Still, fantastic product.

[harshhwardhanrai]

vs code merge editor is much better than this rubbish intellij