From: Andreas Ericsson <ae@op5.se>
Date: Thu, 04 Jan 2007 15:37:56 GMT
Subject: Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge
Message-ID: <459D1F54.1060709@op5.se>
In-Reply-To: <7vmz51usqf.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> 
>> Junio C Hamano <junkio@cox.net> wrote:
>>> After a pull that results in a conflicted merge, a new user
>>> often tries another "git pull" in desperation.  When the index
>>> is unmerged, merge backends correctly bail out without touching
>>> either index nor the working tree, so this does not make the
>>> wound any worse.
>> I've seen this many times too.  I don't understand why users cannot
>> read output messages and realize the current command failed, but
>> they don't.  *sigh*
> 
> That is not user's fault.  Tools should not make things worse
> when run more than once after they failed, and we do not either,
> so it is not a stupid behaviour on the user's part to do that.
> 
> We just need to make sure that it is more clear to the user that
> pull after a conflicted pull is futile, which is what this patch
> does.
> 

"Pulling is futile. Nothing will be assimilated" ?

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231