Re: [RFC/PATCH] fail pull/merge early in the middle of conflicted merge

From: Junio C Hamano <junkio@cox.net>
Date: Jan 2, 2007, 19:35 UTC
Message-ID: <7vmz51usqf.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070101204354.GA26687@spearce.org>

"Shawn O. Pearce" <spearce@spearce.org> writes:

Show 10 quoted lines

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