Question

我想将trustExitCode设置为false并将keepTemporaries设置为true，但它不起作用...我不会感到不安和为什么。这是我的~/.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 ,. ..

我找不到错误......

Answer 1

我认为您应该将path设置添加到mergetool XYZ配置而不是cmd。这是我自己的设置，可以正常工作。

[mergetool "kdiff3"]
    path = PATH_TO_KDIFF3
    trustExitCode = false
    keepTemporaries = true
[mergetool]
    keepBackup = true
[merge]
    tool = kdiff3
    conflictstyle = diff3

为什么我的Git mergetool配置不起作用？

1 个答案: