我想设置trustExitCode
到虚假和keepTemporaries
为真,但它不起作用......我不明白为什么。这是我的~/.gitconfig
:
[merge]
conflictstyle = diff3
tool = p4merge
[mergetool]
keepTemporaries = true
keepBackup = true
trustExitCode = false
[mergetool "p4merge"]
trustExitCode = false
keepTemporaries = true
[mergetool "mymeld"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE
trustExitCode = false
keepTemporaries = true
[mergetool "myp4merge"]
cmd = p4merge $BASE $LOCAL $REMOTE $MERGED
trustExitCode = false
keepTemporaries = true
当我使用 p4merge、myp4merge 或 mymeld 保存一些修改时,Git 不会询问我预期的“合并成功吗?[y/n]”,并且不会留下 file.BASE、file.REMOTE,...
我找不到错误...
我认为你应该添加path
设置为mergetool XYZ
配置而不是cmd
。这是我自己的设置,可以正常工作。
[mergetool "kdiff3"]
path = PATH_TO_KDIFF3
trustExitCode = false
keepTemporaries = true
[mergetool]
keepBackup = true
[merge]
tool = kdiff3
conflictstyle = diff3
本文内容由网友自发贡献,版权归原作者所有,本站不承担相应法律责任。如您发现有涉嫌抄袭侵权的内容,请联系:hwhale#tublm.com(使用前将#替换为@)