Rollback a Git merge

Question

develop branch
--> dashboard (working branch)

I use git merge --no-ff develop to merge any upstream changes into dashboard

Answer 1

From here:

http://www.christianengvall.se/undo-pushed-merge-git/

git revert -m 1 

Git revert adds a new commit that rolls back the specified commit.

Using -m 1 tells it that this is a merge and we want to roll back to the parent commit on the master branch. You would use -m 2 to specify the develop branch.