git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <junkio@cox.net>
Date
Aug 12, 2006, 01:01 UTC
Message-ID
<7vzmearclv.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<ebj7er$64j$1@sea.gmane.org>
Jakub Narebski <jnareb@gmail.com> writes:
Show 13 quoted lines
> 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.

Previous: Jakub NarebskiNext: Junio C Hamano
Message 2 of 8 in “How to resolve git-am conflict (possible bug)”
  1. Jakub NarebskiAug 12, 2006
  2. Junio C HamanoAug 12, 2006
  3. Junio C HamanoAug 12, 2006
  4. Jakub NarebskiAug 12, 2006
  5. Jakub NarebskiAug 12, 2006
  6. Junio C HamanoAug 12, 2006
  7. Johannes SchindelinAug 12, 2006
  8. Junio C HamanoAug 12, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.