lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Git conflicts


From: Johannes Schindelin
Subject: Re: Git conflicts
Date: Sun, 22 Jun 2008 19:44:18 +0100 (BST)
User-agent: Alpine 1.00 (DEB 882 2007-12-20)

Hi,

On Sun, 22 Jun 2008, Rune Zedeler wrote:

> 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...?

Oh?  I had the impression that you did a "git revert MERGE_HEAD", but 
then, I haven't had enough time to take a proper look at 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 ...

Yes, like others have commented, you have to delete with "git 
push <remote> :<branch>" and then you can push it with "git push <remote> 
<branch>".

Ciao,
Dscho





reply via email to

[Prev in Thread] Current Thread [Next in Thread]