进行时:
git merge some-branch
我懂了
BUG: There are unmerged index entries:
BUG: 3 docfatal: Bug in merge-recursive.c
不知道这意味着什么，但是看起来比通常情况更令人意外。我应该怎么办？有一些清理命令可以帮助我吗？
编辑
更糟糕的是，此错误实际上是在我的源代码之一中传播的。由于
some-branch最初只是我的本地工作，因此将其推送到远程服务器上。然后克隆一个新的存储库，并尝试将上述分支 merge 到此副本上，并得到相同的消息。编辑2
我使用GIT_MERGE_VERBOSITY = 5并得到:
$> export GIT_MERGE_VERBOSITY=5; git merge origin/funkload
Merging:
a1ef5a2 Uaktualniony INSTALL.
virtual origin/funkload
found 2 common ancestor(s):
d2eb442 Resources py.
119871b Nowy commit w doc.
Merging:
d2eb442 Resources py.
119871b Nowy commit w doc.
found 1 common ancestor(s):
62f4183 Poprawiony bug w obsłudze linków do resources, które są null.
Removing doc/concept/agreement.lyx
Removing doc/concept/agreement.pdf
Removing doc/concept/concept.lyx
...
Removing druglo-doc
Removing src/db/fixtures/initial.json
Skipped src/druglo/backend/actions/tests/fight.py (merged same as existing)
Auto-merging src/druglo/backend/characters/models/behaviours.py
CONFLICT (content): Merge conflict in src/druglo/backend/characters/models/behaviours.py
Auto-merging src/druglo/backend/players/models/players.py
Auto-merging src/druglo/backend/worlds/resources.py
CONFLICT (content): Merge conflict in src/druglo/backend/worlds/resources.py
Auto-merging src/druglo/common/integrity/webservices/resources.py
CONFLICT (content): Merge conflict in src/druglo/common/integrity/webservices/resources.py
Removing src/druglo/frontend/cityscreen/models.py
Removing src/druglo/frontend/forms.py
Removing src/druglo/frontend/mainscreen/models.py
Removing src/druglo/frontend/models.py
CONFLICT (directory/file): There is a directory with name doc in Temporary merge branch 1. Adding doc as doc~Temporary merge branch 2
BUG: There are unmerged index entries:
BUG: 3 docfatal: Bug in merge-recursive.c
注意:我最近将目录之一移到了单独的子模块中。因此，我遇到了很多冲突。该错误似乎与此有关。
最佳答案
该错误消息是introduced in January 2010，为了帮助调试这种情况，Junio C. Hamano建议将GIT_MERGE_VERBOSITY设置为5:
OP julkiewicz报告
CONFLICT (directory/file):
There is a directory with name doc in Temporary merge branch 1.
Adding doc as doc~Temporary merge branch 2
允许隔离导致此错误消息的目录。
关于Git产生 "BUG: There are unmerged index entries"，我们在Stack Overflow上找到一个类似的问题：https://stackoverflow.com/questions/6761229/