From: Alireza <rezaxm@gmail.com>
To: git@vger.kernel.org
Subject: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately
Date: Thu, 16 Jul 2020 21:45:24 +0430 [thread overview]
Message-ID: <CAD9n_qh0y84HC6sX1OxXWWv8dDMMA_tPv9zRknePVivQq_rfww@mail.gmail.com> (raw)
Hi,
Even though the merge commit's message includes conflicted files by
default, the *resolution* itself is lost, that is, it's hard or
impossible to review how the author *resolved* said conflicts.
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.
That would be extremely helpful for a code reviewer to see how a
possibly external contributor has dealt with upstream changes e.g. in
a long-standing branch.
Any comment would be appreciated.
Thanks,
Alireza
next reply other threads:[~2020-07-16 17:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 17:15 Alireza [this message]
2020-07-16 17:25 ` Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately Michal Suchánek
2020-07-16 17:31 ` Junio C Hamano
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=CAD9n_qh0y84HC6sX1OxXWWv8dDMMA_tPv9zRknePVivQq_rfww@mail.gmail.com \
--to=rezaxm@gmail.com \
--cc=git@vger.kernel.org \
/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).