From: Junio C Hamano <gitster@pobox.com>
To: Alireza <rezaxm@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately
Date: Thu, 16 Jul 2020 10:31:56 -0700 [thread overview]
Message-ID: <xmqqo8ofgycz.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAD9n_qh0y84HC6sX1OxXWWv8dDMMA_tPv9zRknePVivQq_rfww@mail.gmail.com> (Alireza's message of "Thu, 16 Jul 2020 21:45:24 +0430")
Alireza <rezaxm@gmail.com> writes:
> The proposal is that an option like `-X clean` would commit a clean
> merge and leave out any conflicting hunks in the tree for a follow-up
> commit to resolve conflicts.
You need to clarify what "leave out" means to you. If you and a
side branch started from the same place and you did one thing while
the side branch did something else, you would get a conflict.
What would the "clean" (by your definition) result have in that
block of contents that actually has a conflict? Do you mean to say
"Pick our version and ignore theirs in the blocks where the changes
conflict"? If so perhaps -Xours merge strategy option that the
recursive backend offers is what you are looking for?
next prev parent reply other threads:[~2020-07-16 17:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 17:15 Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately Alireza
2020-07-16 17:25 ` Michal Suchánek
2020-07-16 17:31 ` Junio C Hamano [this message]
2020-07-21 16:15 ` Alireza
2020-07-21 17:08 ` Elijah Newren
2020-07-21 17:16 ` Alireza
2020-07-21 17:34 ` Elijah Newren
2020-07-21 20:43 ` Junio C Hamano
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=xmqqo8ofgycz.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rezaxm@gmail.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).