Re: How to resolve git-am conflict (possible bug)

Jakub Narebski wrote:

Junio C Hamano wrote:

[...] 

quoted

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