[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git conflicts
From: |
Rune Zedeler |
Subject: |
Re: Git conflicts |
Date: |
Sun, 22 Jun 2008 20:21:30 +0200 |
User-agent: |
Thunderbird 2.0.0.14 (X11/20080502) |
Johannes Schindelin skrev:
FWIW the proper way to undo a merge is to
$ git rebase --onto MERGE_HEAD^ MERGE_HEAD
where MERGE_HEAD has to be substituted by the merge commit that you want
to undo. (This command transplants the commits you did since the merge
onto the commit which was current right before the merge.)
Well, yeah, this is basically what I ended up doing, isn't it...?
Note: this rewrites history, so if you pushed it already, people pulling
from you (as opposed to fetching) will not be happy with you pushing a
rewritten history.
Problem is that savannah does not accept push -f ...
-Rune
- Re: Git conflicts, (continued)
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, John Mandereau, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/22
- Re: Git conflicts, Valentin Villenave, 2008/06/22
Re: Git conflicts, Rune Zedeler, 2008/06/21
Re: Git conflicts, Johannes Schindelin, 2008/06/21
Re: Git conflicts,
Rune Zedeler <=
Re: Git conflicts, Johannes Schindelin, 2008/06/22