From: Stephen Kelly <steveire@gmail.com>
To: git@vger.kernel.org
Subject: Re: No way to resolve git am conflicts.
Date: Sat, 08 Jan 2011 20:21:42 +0100 [thread overview]
Message-ID: <igadg7$4tb$1@dough.gmane.org> (raw)
In-Reply-To: 20110108163633.GB28898@burratino
Jonathan Nieder wrote:
> Stephen Kelly wrote:
>
>> git am the.patch
> [...]
>> Applying: Introduce new configuation option to override committer
>> information
>> error: patch failed: builtin/commit.c:1352
>> error: builtin/commit.c: patch does not apply
>> Patch failed at 0001 Introduce new configuation option to override
>> committer information
>> When you have resolved this problem run "git am --resolved".
>> If you would prefer to skip this patch, instead run "git am --skip".
>> To restore the original branch and stop patching run "git am --abort".
>> $ git diff
> [...]
>> As git status doesn't tell me what the conflict is, I can't resolve it.
>
> Have you tried "git am -3" or "git am --reject" (after "git am
> --abort")?
git am -3 worked, thanks.
>
> I agree that the hints printed are suboptimal in this case. Please
> feel free to make them better if you have time for it. :)
prev parent reply other threads:[~2011-01-08 19:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-08 13:11 No way to resolve git am conflicts Stephen Kelly
2011-01-08 16:36 ` Jonathan Nieder
2011-01-08 19:21 ` Stephen Kelly [this message]
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='igadg7$4tb$1@dough.gmane.org' \
--to=steveire@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).