Menu
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.
When the program sees a conflict it shows up a button which says "Open in merge tool". Since I haven't configured a Merge tool, I head over GitKraken's preferences and checked out the "Merge tool" section. "Git Config Default" option was selected there and I could only choose "None" or "Git Config Default" options.
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.
After running a few commands from those steps and some others trying to make it work my .gitconfig file looks like this:
[user] name = <myname> email = <mymail> [filter "lfs"] [filter "lfs"] clean = git-lfs clean %f smudge = git-lfs smudge %f required = true [core] autocrlf = true excludesfile = C:\\Users\\<myuser>\\Documents\\gitignore_global.txt [merge] tool = meld [mergetool "meld"] path = C:\\Program files (x86)\\Meld\\Meld.exe [mergetool] prompt = false I'm not really sure what I did and how to make it work... Anyone can help?
878
Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run git mergetool --tool-help for the list of valid <tool> settings. If a merge resolution program is not specified, git mergetool will use the configuration variable merge.
The Perforce Visual Client (P4V) is a free tool that provides one of the most explicit interface for merging (see some screenshots). Works on all major platforms.
What Is the Merge Tool? The Merge Tool combines data from multiple sources, then adds them into a new data set. It's not only geometry, but it also merges attributes with the option to match fields from input datasets. When you use the Merge Tool, features have to be the same geometry type (points, lines, or polygons).
GitKraken has finally added support for choosing one of the merge tools listed in your .gitconfig file.
138
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
