我正在尝试将一个开发分支合并到主分支并压缩提交记录。
stefanos-imac:trunk borini$ git merge --squash devel
CONFLICT (content): Merge conflict in test1
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2224 and retry the command.
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.
没问题。
stefanos-imac:trunk borini$ git config merge.renameLimit 999999
然后我尝试取消合并操作,再使用更高的限制重新进行合并
stefanos-imac:trunk borini$ git merge --abort
fatal: There is no merge to abort (MERGE_HEAD missing).
好的,也许我需要按照指示重新调用合并命令。
stefanos-imac:trunk borini$ git merge --squash devel
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
哦,Git,你为什么这么讨厌?
更重要的是,有没有人知道如何摆脱这种情况?