Support 3 way merge for git conflicts

[asydneylover]

IntelliJ, and all other IntelliJ-based IDE such as WebStorm, support a git merge's conflict resolution tool that it shows the conflict in three columns:

• the first column for Local Changes
• the third column for Changes from Server
• the second column for Conflict Resolution Result

Please see my attached file.

I find that it's super easy for us to resolve conflict, because I can compare the Local Changes and the Server Changes on the same windows, and I can see the Resolution Result immediately.

Can we please support that?

[Auwalms]

This will be a super cool feature, I use VSCode for my day job but often resort to WebStorm when I need to resolve a merge conflict due to its interactivity and ease to use.

[Nodragem]

Any news on this? this feature would be amazing. On one hand, there is a diff tool (i.e. comparing two files) in VS code, but you cannot edit / chose what to keep; on the other hand, there is a merge conflict tool that allows to chose what to keep (current change / their change). Now, the best would be to have both tools into one tool, such as the tool suggested by @uyhung.

I also wanted to add, for any contributor who comes by: VS Code is an amazing piece of software, keep it up :) !

[OJFord]

git config merge.conflictStyle diff3 and you have this today but with VSCode's in-editor layout - which is vastly better than popping up a dialogue and a new window to view the file you already had open IMO!

[rajjejosefsson]

Anyone know if there is any plugin that can make this possible ?

[OJFord]

@rajjejosefsson As I said above, you can set: (git config merge.conflictStyle diff3)

[merge]
  conflictStyle = diff3

to see them/common/us. It won't change the VSCode formatting/theme, but you will get those three parts to your diff instead of just them/us as is the (git) default.

Unless there's something else (other than opening multiple dialogues just to get back to view a diff in the file you already had open) that JetBrains IDEs offer that I'm missing here?

[smbkr]

The newly released Sublime Merge has a similar implementation.

[tsachit]

This will be a super cool feature, I use VSCode for my day job but often resort to WebStorm when I need to resolve a merge conflict due to its interactivity and ease to use.

You can add these configuration in your .gitconfig file and type "git mergetool" on your terminal whenever conflict appears. It'll only open your merge gui interface from webstorm for each file.

[mergetool "webstorm"]
    cmd = webstorm merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
    trustExitCode = true
[merge]
    tool = webstorm

[numandev1]

@daviddossett @isidorn what is the status of 3 way merge because, in the iteration plan, you are working 3-way merge.

[isidorn]

We are working on 3-way merge - we are in the investigation phase. As soon as we have updates we will share here. We hope this is something that will happen this year.

[nemchik]

Hassling contributors for ETAs isn't going to get it released faster. Please be appreciative that someone has taken the time to put their efforts into making this happen for us all.

[machinecode]

Hi @isidorn, my guess is most of the people here expect a 3-way merge screen with a magic wand like Intellij had. Please consider having such that feature too.

[jrieken]

Just repeating what @isidorn said before: work has started and you can expect something "real" soon'ish, likely May.

I have locked this issue because unfortunately unhelpful comments out-weight helpful ones. We have an idea what to do and everyone is invited to provide constructive feedback as soon as this land in insiders. We will be using this feature area label: merge-editor

Thanks for being patient and stay tuned.

[hediet]

In the previous release we shipped the basic merge editor (release notes). In the release next week, we are going to enable it by default.
Also, the next release includes CLI arguments to configure VS Code as merge tool.

Please let us know what you think about the new merge editor, so we can continue improving it!