Re: [PATCH 1/2] rebase: add a --rebase-merges=drop option

From: Alex Henrie <alexhenrie24@gmail.com>
Date: Feb 20, 2023, 17:03 UTC
Message-ID: <CAMMLpeSAspkSf3KDpoH_WFwGV4z8+4ag=kzqgHPypvXp9yiGyA@mail.gmail.com>
In-Reply-To: <8857003a-f33d-00c5-5e1e-bfbcd60924ae@dunelm.org.uk>

On Mon, Feb 20, 2023 at 2:31 AM Phillip Wood <phillip.wood123@gmail.com> wrote:

Show 12 quoted lines

>
> On 20/02/2023 03:32, Alex Henrie wrote:
> > Name the new option "drop" intead of "no" or "false" to avoid confusion > in the future if --rebase-merges grows the ability to truly "rebase"
> > merge commits by reusing the conflict resolution information from the
> > original merge commit, and we want to add an option to ignore the
> > conflict resolution information.
> >
> > This option can be used to countermand a previous --rebase-merges
> > option.
>
> I'm a bit confused as to the reason for this change - what's the
> advantage over just saying --no-rebase-merges which already exists?

I didn't know that there was a --no-rebase-merges option because there is no documentation about it and no tests for it. I will replace this patch with patches that add the missing documentation and tests.

-Alex