Day 49: How to fix (MERGE_HEAD exists) error and undo a git push

Run into this error, again. I keep forgetting how to fix it so i am documenting this for reference sake.
Solution

• Abort the merge

git merge --abort

• Git pull

git pull

• Resolve the conflict by adding a message, saving and closing the editor.
• Git push

git push

Undo a git push

To undo a push to github this worked for me.

git push -f origin HEAD^:master

Day 49