using "git revert <merge_commit>" is very nasty[1]. using 'git reset <before_bad_merge> is less so.
[1]http://kernel.org/pub/software/scm/git/docs/howto/revert-a-f...
using "git revert <merge_commit>" is very nasty[1]. using 'git reset <before_bad_merge> is less so.
[1]http://kernel.org/pub/software/scm/git/docs/howto/revert-a-f...