无法在Sourcetree中开始合并后提交 [英] Cant commit after starting a merge in Sourcetree

问题描述

致命：你处于一个中间位置合并 - 不能修改。

我该如何解决这个问题？据我所知，我已经解决了所有冲突，我只需要完成合并并提交更改。但产品不会让我，也不会给我任何我接下来要做的事情的线索，也没有选择完成合并。

<每次我尝试提交我的更改时，都会收到错误消息，现在我不知道该怎么办！

解决方案

您可以手动删除 .git / MERGE_HEAD 不能告诉你只是在做一个合并。它可以让你像正常一样修改前一次提交的索引更改。

When trying to commit after a merge I'm getting this error message:

"fatal: You are in the middle of a merge -- cannot amend."

How do i resolve this? as far as I know I have resolved all conflicts, i just need to complete the merge and commit the changes. but the product won't let me and doesn't give me any clues as to what I am meant to do next, and there is no option to "complete the merge"

Everytime I try to commit my changes I get the error message and I now have no idea what to do about it!

解决方案

You can manually delete .git/MERGE_HEAD and Git won't be able to tell that you were just doing a merge. It will let you amend the previous commit with the changes in your index just like normal.

这篇关于无法在Sourcetree中开始合并后提交的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！