From: Alireza <rezaxm@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Request for adding a "clean" merge strategy for a double-commit merge to deal with conflicts separately
Date: Tue, 21 Jul 2020 21:46:59 +0430 [thread overview]
Message-ID: <CAD9n_qim=g62TnckSG3-=1yPDCwQc3u0kYouVSU3f_a3C+NtMQ@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BE2R3eUU7WD1Ovkn_OfVH6fc42DnXs5CuBTkMUcQsnCdQ@mail.gmail.com>
> If there were an option to allow git log for a merge to show the
> difference between what an automatic merge would do (complete with
> conflicts) and the end-state that was committed, then the resolution
> would become very accessible and the rest of your request would be
> moot.
Happy to see there's already some interest to make this easier.
However, my main use case is not just to see those changes, ideally it
should be a separate commit to be easily reviewed in a PR, for
example, otherwise the reviewer must pull all changes locally, which
doesn't sound like an improvement, IMO.
next prev parent reply other threads:[~2020-07-21 17:17 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
2020-07-21 16:15 ` Alireza
2020-07-21 17:08 ` Elijah Newren
2020-07-21 17:16 ` Alireza [this message]
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_qim=g62TnckSG3-=1yPDCwQc3u0kYouVSU3f_a3C+NtMQ@mail.gmail.com' \
--to=rezaxm@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@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).