From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: How to resolve git-am conflict (possible bug)
Date: Sat, 12 Aug 2006 11:18:07 +0200 [thread overview]
Message-ID: <ebk6be$31k$2@sea.gmane.org> (raw)
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
next prev parent reply other threads:[~2006-08-12 9:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-12 0:30 How to resolve git-am conflict (possible bug) Jakub Narebski
2006-08-12 1:01 ` Junio C Hamano
2006-08-12 1:20 ` Junio C Hamano
2006-08-12 9:10 ` Jakub Narebski
2006-08-12 9:18 ` Jakub Narebski [this message]
2006-08-12 19:49 ` Junio C Hamano
2006-08-12 9:52 ` Johannes Schindelin
2006-08-12 19:49 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='ebk6be$31k$2@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.