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

git-apply that handles rejects like merge conflicts

From
Ori Avtalion <ori@avtalion.name>
Date
Nov 7, 2011, 22:10 UTC
Message-ID
<4EB85768.1060508@avtalion.name>
Hey,

I'm trying to get git-apply to apply patches, and let me handle the conflicts in a way I'm comfortable with -- by staging the "successful" hunks and leaving conflict markers in the working tree.

With the available flags, I seem to only be able to have successful hunks in the index, and rejected ones in patch-like .rej files.

Is there a way to accomplish this? If not, does anyone think it's a good idea?

-Ori
Next: Jeff King
Message 1 of 10 in “git-apply that handles rejects like merge conflicts”
  1. Ori AvtalionNov 7, 2011
  2. Jeff KingNov 7, 2011
  3. Ori AvtalionNov 7, 2011
  4. Junio C HamanoNov 7, 2011
  5. Jeff KingNov 8, 2011
  6. Junio C HamanoNov 8, 2011
  7. Ori AvtalionNov 8, 2011
  8. Jeff KingNov 8, 2011
  9. Bert WesargNov 8, 2011
  10. Jeff KingNov 8, 2011

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.