When trying to commit after a merge I\'m getting this error message:
<\"fatal: You are in the middle of a merge -- cannot amend.\"
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