On 2016-07-27, at 5:44 AM, Jerome Fouletier <jerome.foulet...@gmail.com> wrote:

> It seems to me the merge caused by your initial checkout has conflicts, and 
> so was not commited (git status to confirm).
> If your objective is to cancel the merge, you can git merge --abort, but I'm 
> not sure what will become of the index changes you had before the checkout -m.

... would you believe I completely forgot about the --abort option? :-)

Yea, I don't know what would have happened to the local changes either.
Still, I suppose it would have been nicer than what I wound up doing.

(took some time to get everything cleaned up, and my history is a bit messy at 
that point, but it got all done.)

> 
> J.
> 
> Le mercredi 27 juillet 2016 02:22:41 UTC+2, Michael Gersten a écrit :
> 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 git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.

---
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 git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to