From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 25 Mar 2006 11:26:30 GMT
Subject: Re: Effective difference between git-rebase and git-resolve
Message-ID: <Pine.LNX.4.63.0603251226040.15524@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <slrne2a94r.cp6.mdw@metalzone.distorted.org.uk>

Hi,

On Sat, 25 Mar 2006, Mark Wooding wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > I am nowhere near kernel people, but I am using git on a machine where it 
> > is too cumbersome to install python. If git-resolve goes, I am without a 
> > merge strategy (at least until git-recursive is ported to C... was that 
> > not the plan with git-merge-tree? What happened on that front?).
> 
> Err... git-resolve isn't the same as git-merge-resolve.

Oooops.

Thank you,
Dscho