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

Re: git-apply that handles rejects like merge conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 8, 2011, 06:15 UTC
Message-ID
<7vd3d3ywai.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20111108054643.GC29643@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> But I think there are two questions:
>
>   1. Should am's 3-way fallback be made more easily available to users
>      of regular "apply"?
>
>   2. Short of doing a 3-way merge, are there better ways to represent
>      failed hunks in the patch target itself, rather than saving ".rej"
>      files?
>
> I'm actually not sure which one Ori was asking about.

Me neither, but if I have to guess it would be the former. If there were a solution better than ".rej" in 2-way context, surely "patch" would have implemented it 10 years before we started ;-).

Previous: Jeff KingNext: Ori Avtalion
Message 6 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.