git merge报BUG: There are unmerge
2023-04-25 本文已影响0人
freesan44
问题
今天进行git merge的时候突然报以下报错信息：
.../Pods/xxxx/xxxx.framework/_CodeSignature/CodeResources: unmerged (2190b4bf36bd5eead4665679ad0347e760842f17)
BUG: There are unmerged index entries:
BUG: 1 .../Pods/xxxx/xxxx.framework/_CodeSignature/CodeResources
BUG: cache-tree.c:675: unmerged index entries when writing inmemory index
解决方案
采用如下命令进行合并：
export GIT_MERGE_VERBOSITY=5; git merge 2faa5498e
