jper.blogg.se

Git mergetool winmerge
Git mergetool winmerge










It seems that as of right now, GitKraken does not fully support all merge tools configured with git-config right now. I'm not really sure what I did and how to make it work. Path = C:\\Program files (x86)\\Meld\\Meld.exe gitconfig file looks like this: Įxcludesfile = C:\\Users\\\\Documents\\gitignore_global.txt I installed Meld for using it with GitKraken, and after that I tried to follow these steps to make it usable within GitKraken's interface, but GitKraken's merge tool choice options haven't changed.Īfter running a few commands from those steps and some others trying to make it work my. "Git Config Default" option was selected there and I could only choose "None" or "Git Config Default" options.

git mergetool winmerge

Since I haven't configured a Merge tool, I head over GitKraken's preferences and checked out the "Merge tool" section. When the program sees a conflict it shows up a button which says "Open in merge tool".

git mergetool winmerge

I downloaded GitKraken for working with Git repositories and it works great for everything I need, but I haven't been able to configure it to use a merge tool like WinMerge or Meld.












Git mergetool winmerge