Configure a merge tool for GitKraken on Windows10

GitKraken has finally added support for choosing one of the merge tools listed in your .gitconfig file.

enter image description here


It seems that as of right now, GitKraken does not fully support all merge tools configured with git-config right now.

In a comment to one of Axosoft’s blog posts about GitKraken, this was discussed:

A User (February 29, 2016)

Any news when using a mergetool works? Is this yet missing or just bugged? I've configured a working mergetool in git global and it works calling it from console but gitkraken just does nothing when clicking "open in mergetool", not even an error message.

James (mod) (March 3, 2016)

There is a known issue with not being able to find the mergetool set and this will be addressed in an upcoming update!

(For some reason, the Disqus plugin on that blog is not loading correctly right now, so you cannot see those comments. I had to look at a cached version from Google to see that)

So it seems that you will have to wait until a future update for GitKraken to support meld or other merge tools (I also tested Beyond Compare on my machine). If KDiff3 works for you, then I guess you’re lucky and you can use that for the time being.


ONly solution for GitKraken and Windows 10, which I can use:

Filename: C:\Users\my-name\.gitconfig

Content:

[user]
    email = [email protected]
    name = Bart Houkes
[merge]
    tool = meld
[mergetool "meld"]
    path = C:/Program Files (x86)/Meld/Meld.exe
    cmd = \"C:/Program Files (x86)/Meld/Meld.exe\" --diff \"$BASE\" \"$LOCAL\" \"$REMOTE\" --output \"$MERGED\"

Tags:

Git

Mergetool

Recent Posts