From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Cc: jnareb@gmail.com
Subject: Re: How to resolve git-am conflict (possible bug)
Date: Fri, 11 Aug 2006 18:01:32 -0700 [thread overview]
Message-ID: <7vzmearclv.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <ebj7er$64j$1@sea.gmane.org> (Jakub Narebski's message of "Sat, 12 Aug 2006 02:30:48 +0200")
Jakub Narebski <jnareb@gmail.com> writes:
> 1078:jnareb@roke:~/git> rm -rf .dotest/
> 1079:jnareb@roke:~/git> git reset --hard
> 1080:jnareb@roke:~/git> git am --3way --utf8 --keep --binary \
> mdir.0/0001-gitweb-Refactor-git_history_body.txt
>
> Applying '[PATCH 1/1] gitweb: Refactor git_history_body'
>
> error: patch failed: gitweb/gitweb.perl:2295
> error: gitweb/gitweb.perl: patch does not apply
> error: patch failed: gitweb/gitweb.perl:2295
> error: gitweb/gitweb.perl: patch does not apply
> Patch failed at 0001.
> When you have resolved this problem run "git-am -3 --resolved".
This is not falling back to three-way. One likely reason is you
do not have blobs identified on the "index " line of the patch
in your repostory.
next prev parent reply other threads:[~2006-08-12 1:01 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 [this message]
2006-08-12 1:20 ` Junio C Hamano
2006-08-12 9:10 ` Jakub Narebski
2006-08-12 9:18 ` Jakub Narebski
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=7vzmearclv.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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).