Re: Improving merge of tricky conflicts

From: Jacob Keller <jacob.keller@gmail.com>
Date: Jul 24, 2020, 05:15 UTC
Message-ID: <CA+P7+xpPDu900dao08wfYtZ2pqU89D9vmwQPuFT-z5S5b-DXNA@mail.gmail.com>
In-Reply-To: <xmqqimedq5c8.fsf@gitster.c.googlers.com>

On Thu, Jul 23, 2020 at 2:43 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

> If your merge used the merge (as opposed to diff3) style, and seeing
> that the resulting conflict is not easy to review and you wish you
> used diff3 style instead, it is way too late for any option to "git
> merge" to help you.
>
> But having an option to "git checkout" lets you move forward from
> that state, so it also makes 100% more sense than an option to "git
> merge".
>

Perhaps the issue is just that it's not discoverable easily because it's a different command.