When trying to commit after a merge I\'m getting this error message:
\"fatal: You are in the middle of a merge -- cannot amend.\"
After resolving the conflicts,you should try "git rebase --continue" for the rebase to complete.Post that, commit --amend is allowed.