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

Re: [PATCH] apply: support --ours, --theirs, and --union for three-way merges

From
Alex Henrie <alexhenrie24@gmail.com>
Date
Sep 9, 2024, 14:10 UTC
Message-ID
<CAMMLpeREE8VCUzdta6oFrHqT=ctOPYxKBBJ1=6j0QpbAMgrhGA@mail.gmail.com>
In-Reply-To
<xmqqwmjov772.fsf@gitster.g>
On Fri, Sep 6, 2024 at 2:49 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> An unrelated #leftoverbits tangent.
>
> We probably should teach add "union" as a valid choice in
> .recursive_variant in merge-recursive.c:parse_merge_opt(), together
> with "ours" and "theirs" that are already supported.

I agree, that would be really nice, and it would simplify the tests for `git apply -3 --union`.

The other changes you requested are done in v2. Thanks for the feedback!
-Alex
Previous: Junio C HamanoNext: Alex Henrie
Message 3 of 5 in “apply: support --ours, --theirs, and --union for three-way merges”
  1. apply: support --ours, --theirs, and --union for three-way mergesAlex Henrie, Sep 6, 2024
  2. Junio C HamanoSep 6, 2024
  3. Alex HenrieSep 9, 2024
  4. 0/1 apply: support --ours, --theirs, and --union for three-way mergesAlex Henrie, Sep 9, 2024
  5. 1/1 apply: support --ours, --theirs, and --union for three-way mergesAlex Henrie, Sep 9, 2024

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.