问题描述
我有冲突,所以我输入:
git mergetool
然后我得到一条消息:
通常,当我这样做时,它会打开kdiff3,因此我可以合并这些差异。 b $ b
现在当我这样做时,它只是继续到下一个文件,并且kdiff3根本不打开。
和我的系统路径,都看起来很完美。配置文件如下:
[合并]
工具= kdiff3
[mergetoolkdiff3]
path = c:/ Program Files(x86)/KDiff3/kdiff3.exe
[diff]
guitool = kdiff3
[difftoolkdiff3]
path = c:/ Program Files(x86)/KDiff3/kdiff3.exe
[core]
editor = \C:/ Program Files(x86)/GitExtensions/GitExtensions.exe\fileeditor autocrlf = true
[user]
name = James Farrell
email = [email protected]
[github]
user = whygosystems
token = 87d00c2e613b3a7c8c1be817b75b8a33
[diff]
external = C:/ Program Files(x86)/Git/cmd/git-diff-wrapper.sh
任何人有什么想法可能是错的?
我有一种感觉(尽管我可能是错的,这是一个问题,因为我安装了新的Github窗口客户端)....
我意识到这是旧的,但对于未来的Google s,KDiff3也有一个选项,如果合并是微不足道的,它会静静地解决它,甚至从不显示窗口。
我遇到过这种情况过去,所以这可能是你正在发生的事情。我认为这个选项被称为'自动保存并退出合并而不发生冲突'。
I have conflicts, so I type:
git mergetool
I then get a message saying:
Normally when I do this, it open kdiff3 so I can merge the differences.
now when I do it, it just continues to the next file, and kdiff3 doesn't open at all.
I triple cheched my git config and my system path and all seems perfect. Config file is as follows:
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[core]
editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor autocrlf = true
[user]
name = James Farrell
email = [email protected]
[github]
user = whygosystems
token = 87d00c2e613b3a7c8c1be817b75b8a33
[diff]
external = C:/Program Files (x86)/Git/cmd/git-diff-wrapper.sh
Anyone have any ideas what might be wrong?
I have a feeling (though I could be wrong, that this has been a problem, since I installed the new Github windows client)....
I realize this is old, but for future googlers, KDiff3 also has an option where if the merge is trivial, it will resolve it silently and never even show a window.
I've had that happen to me in the past, so it might be what's happening for you. I think the option is called 'Auto save and quit on merge without conflicts'.
这篇关于使用mergetool命令Kdiff3不会打开的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!