From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 25 Mar 2006 09:37:09 GMT
Subject: Re: Effective difference between git-rebase and git-resolve
Message-ID: <Pine.LNX.4.63.0603251034550.14457@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7v1wwrys07.fsf@assigned-by-dhcp.cox.net>

Hi,

On Fri, 24 Mar 2006, Junio C Hamano wrote:

> If nobody in the upper echelon of kernel people (meaning, longest-time 
> git users) use git-resolve anymore, I think we should mark it deprecated 
> and remove it eventually.

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

Ciao,
Dscho