Try git reset HEAD~1 && git push -f That should rewrite the history and "undo" the merge. Just make sure everyone who is working on it pulls the updated HEAD or it will cause problems.
git reset HEAD~1 && git push -f
2.1m questions
2.1m answers
60 comments
57.0k users