From: Alex Henrie <alexhenrie24@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, bert.wesarg@googlemail.com
Subject: Re: [PATCH] apply: support --ours, --theirs, and --union for three-way merges
Date: Mon, 9 Sep 2024 08:10:06 -0600 [thread overview]
Message-ID: <CAMMLpeREE8VCUzdta6oFrHqT=ctOPYxKBBJ1=6j0QpbAMgrhGA@mail.gmail.com> (raw)
In-Reply-To: <xmqqwmjov772.fsf@gitster.g>
On Fri, Sep 6, 2024 at 2:49 PM Junio C Hamano <gitster@pobox.com> wrote:
> 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
next prev parent reply other threads:[~2024-09-09 14:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 4:22 [PATCH] apply: support --ours, --theirs, and --union for three-way merges Alex Henrie
2024-09-06 20:49 ` Junio C Hamano
2024-09-09 14:10 ` Alex Henrie [this message]
2024-09-09 14:10 ` [PATCH v2 0/1] " Alex Henrie
2024-09-09 14:10 ` [PATCH v2 1/1] " Alex Henrie
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='CAMMLpeREE8VCUzdta6oFrHqT=ctOPYxKBBJ1=6j0QpbAMgrhGA@mail.gmail.com' \
--to=alexhenrie24@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).