git - 在 merge.renameLimit 警告加上冲突后撤消 git merge

Question

我正在尝试将开发分支 merge 到主分支中。

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

然后我尝试撤消 merge 并用更高的限制重做

stefanos-imac:trunk borini$ git merge --abort
fatal: There is no merge to abort (MERGE_HEAD missing).

好吧，也许我必须按照它说的去做，重新调用 merge 命令

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'.

哦， SCSS ，你怎么这么 SCSS ？

更重要的是，有谁知道如何摆脱这种情况？

Answer 1

Em，git reset --hard origin/master?