From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 12 Aug 2006 09:18:07 GMT
Subject: Re: How to resolve git-am conflict (possible bug)
Message-ID: <ebk6be$31k$2@sea.gmane.org>
In-Reply-To: <ebk5tf$31k$1@sea.gmane.org>

Jakub Narebski wrote:

> Junio C Hamano wrote:
[...] 
>> More likely explanation is that you edited the patch by hand for
>> some reason, and made it inapplicable to the base blob the
>> "index" line records.

Original (not edited) version of patch generates nice merge conflict.

> It would be nice then if git-am was more verbose, for example
> "Applying patch to blob 7ea52b1... gitweb/gitweb.perl" or something
> like that.

Or at least some information what git-am is attempting before second 
'patch failed' error message...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git