Undo the merge

• If you don't like the outcome of the merge, it's easy to undo

• Suppose you've done this:

      git checkout master
      git merge topic

• You can always throw away the most recent commit with:

      git reset --hard HEAD^

• After that we're back to this:

• Then you can checkout topic and continue from there as before

Next

Copyright © 2013 M. J. Dominus