Cant commit after starting a merge in Sourcetree

后端 未结 5 1316
后悔当初
后悔当初 2020-12-28 13:43

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

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

<
5条回答
  •  清歌不尽
    2020-12-28 13:53

    After resolving the conflicts,you should try "git rebase --continue" for the rebase to complete.Post that, commit --amend is allowed.

提交回复
热议问题