git mergetool 报告 "No files need merging"

Question

最近出于某种原因，每次我 pull 并遇到 merge 冲突时，运行 git mergetool 都会报告“没有文件需要 merge ”:

$ git pull
First, rewinding head to replay your work on top of it...
Applying: replaced home button with Cancel
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
    Classes/Controllers/HomeController.m
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0002 moved rollback into cancel button in log watching

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

$ git mergetool
No files need merging

如果我运行 git rebase --abort 并再次 pull ，要么相同的事情发生在不同的冲突上，要么 pull 成功而没有 merge 冲突。这些 pull 之间没有远程变化，因此冲突似乎并没有消失。

这里是这个分支和远程的配置方式:

[branch "develop"]
        remote = origin
        merge = refs/heads/develop
        rebase = true
[remote "origin"]
        url = <my repo url>
        fetch = +refs/heads/*:refs/remotes/origin/*

Answer 1

这为我修复了它:
git mergetool.

我找到了这个修复 here