What's a good way to undo a merge? In my case: I did git checkout -m develop
and what I had left over (that did not belong on the branch I was working on) turned out to be a mess. So, I tried going back git checkout -m bugfix/rain-speed-debug But got an error that I needed to finish my merge first. error: you need to resolve your current index first OK, so put all of this on a branch git checkout -b MergeMess error: you need to resolve your current index first What's a way (any way) to put a bad merge off for later? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
