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.
Though this would work, it is a hack and not recommended. All is needed here is to let git know the merge is completed git commit -a as per this answer