git中的p4merge合并工具出错

Question

我已经为p4merge设置了类路径，并设置了文件.gitconfig，但是当p4merge工具打开这两个冲突的文件时，我得到了这个错误。有人知道解决方案吗？

添加到类路径："C:\Program Files\Perforce\p4merge.exe“添加到.gitconfig文件：

[merge]
    tool = p4merge
[mergetool "p4merge"]
    cmd = p4merge.exe \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$MERGED\\\"

错误消息：

Normal merge conflict for 'protected/views/layouts/main.php':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (p4merge):
C:\Program Files (x86)\Git/libexec/git-core/mergetools/p4merge: line 8: p4merge:
 command not found
protected/views/layouts/main.php seems unchanged.
Was the merge successful? [y/n] n
merge of protected/views/layouts/main.php failed

Answer 1

它对我来说很有效：

[merge]
    keepBackup = false;
    tool = p4merge
[mergetool "p4merge"]
    path = C:/Program Files/Perforce/p4merge.exe
    cmd = \"C:/Program Files/Perforce/p4merge.exe\" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
[difftool]
    prompt = false
[mergetool]
    prompt = false

Answer 2

为什么每件事都那么难，我讨厌写命令，我做了什么？

1. Install p4Merge tool form here serach here P4Merge并安装可执行文件，然后您只需使用

​

​

1. 以Windows用户身份安装
2. 进入用户目录，搜索.gitconfig，编辑并添加

mergetool " p4merge“path = C:\Program Files\Perforce\p4merge.exe cmd = \"C:/Program Files/Perforce/p4merge.exe\”"$BASE“"$LOCAL”"$REMOTE“"$MERGED”合并工具=p4merge

怎么用？当你拉出一些东西并且有冲突时，你可以直接写

git mergetool

该工具将会打开。

​

​

在底部是您的最终版本，您可以在那里编辑，然后只需保存并提交，冲突就会得到解决。

Answer 3

如果您刚刚安装了p4merge，则可能还需要重新启动git控制台，以便注册更新后的环境变量。