Git: Use VS Code as merge editor

[nchammas]

1.0.0 introduced the ability to use VS Code as a git difftool. The relevant global .gitconfig lines are as follows:

[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE

How can I use VS Code as a git mergetool?

The relevant arguments it needs to accept, I believe, are $LOCAL, $REMOTE, $BASE, and $MERGED.

[joaomoreno]

Not supported yet.

[skijit]

Is this feature being included in the next iteration, by any chance?

[joaomoreno]

Probably not, this is a big endeavour, since a merge UI needs to be implemented.

[ZombieProtectionAgency]

Is there any plan for the merge UI to support three-way merging? (e.g. change a, change b, common ancestor)

[joaomoreno]

We wouldn't have it any other way. 😉

[theoy]

Can't upvote this one enough. This is the top scenario for me to fall back to a different editor/IDE (*cough* memory-hog Webstorm cough) :)

[kumarharsh]

If possible, this would be a godsend, due to several reasons:

1. Meld, although functional, severely lacks in functionality in relation to configurable key-bindings and colour highlighting, and is really really slow to start on my Windows machine, even when installed on an SSD.
2. I'd like the merge editor to also accept the same .editorconfig/settings which my main text editor has, and if vscode does fill that gap, it'd be awesome.
3. On smaller levels, the editor theme and familiarity with the interface is also a plus - sometimes I or my team makes mistakes while merging due to no syntax highlighting, which although small, have caused huge bugs in production systems. And some of those mistakes are rather difficult to even fathom until they occur. I guess there would always be similar problems with mergetools, but perhaps they will be reduced if one could merge in the same environment in which one writes.

Like I said, meld is ok, but it'd be super if vscode would some day be used in that scenario.

[egucciar]

Visual Studio was always my code merger of choice. Would love to see this feature!

[cchitsiang]

No problem on using other git mergetool but really would like to see own merge UI happen really soon!!