问题描述
我下载了GitKraken来使用Git存储库，它可以很好地满足我的所有需求，但是我无法将其配置为使用WinMerge或Meld之类的合并工具.
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.
程序看到冲突时，将显示一个按钮，显示在合并工具中打开".由于尚未配置合并"工具，因此我将检查GitKraken的首选项，并查看合并工具"部分.在那里选择了"Git Config Default"选项，我只能选择"None"或"Git Config Default"选项.
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.
我安装了Meld以便与GitKraken一起使用，然后我尝试遵循这些步骤使其可在GitKraken的界面中使用，但GitKraken的合并工具选择选项未更改.
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.
在这些步骤中运行了一些命令，并尝试了其他一些命令使其运行后，我的.gitconfig文件如下所示:
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?
推荐答案
GitKraken最终增加了对选择.gitconfig文件中列出的合并工具之一的支持.
GitKraken has finally added support for choosing one of the merge tools listed in your .gitconfig file.
这篇关于在Windows10上为GitKraken配置合并工具的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！