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 wont let me and doesnt give me any clues as to what I am meant to do next!

2 answers

1 accepted

0 votes
Accepted answer

Turns out not selecting "amend last commit" was the solution...

rm .git/MERGE_HEAD

Should do the trick !

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

734 views 3 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you