{section: I haven't pushed the merge} -If you haven't pushed the merge yet, this is easy. "git reset --hard GOOD_SHA" where GOOD_SHA is the SHA prior to the merge. _Warning_ this _completely destroys_ the merge. It's as if it never happened. _Use with caution._ +If you haven't pushed the merge yet, this is easy. "git reset --hard GOOD_SHA" where GOOD_SHA is the SHA prior to the merge. *Warning:* _This completely destroys the merge and anything committed since._ It's as if it never happened. _Use with caution._ {section: The merge was pushed}