Logo Questions Linux Laravel Mysql Ubuntu Git Menu
HTML CSS JAVASCRIPT SQL PYTHON PHP BOOTSTRAP JAVA JQUERY R React Kotlin
 

Configure a merge tool for GitKraken on Windows10

Tags:

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?

like image 878
RabidTunes Avatar asked Apr 16 '16 17:04

RabidTunes

People also ask

What are the merge tools available in git configuration?

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.

What's the best visual merge tool for git?

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 are merge tools?

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).

1 Answers

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

enter image description here

like image 138
kodybrown Avatar answered Sep 27 '22 22:09

kodybrown
Sign in to Comment

Related questions

How to clear some fields in form - Redux-Form
How to store ansible_become_pass in a vault and how to use it?
Communicating Events from Parent to Child in AngularJS Components
Spring Security/Spring Boot - How to set ROLES for users
How do I access packages installed by `pip --user`?
How to load multiple images in a numpy array ?
difference between javascript foreach loop, for..in and angular forEach loop.?
How to print DataFrame on single line
index: true vs foreign_key: true (Rails)
Want to know the diff among pd.factorize, pd.get_dummies, sklearn.preprocessing.LableEncoder and OneHotEncoder [closed]
TypeScript: cannot find name async/await
How to cast Int to Char in Kotlin

Donate For Us

If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!