From: Elijah Newren <newren@gmail.com>
Date: Sat, 04 Mar 2023 20:36:45 GMT
Subject: Re: [RFC PATCH] sequencer - tipped merge strategy
Message-ID: <CABPp-BFCNjMsxAcLOxr_9Rnu3n_KL5RMCfD_m7ytS+b_gbd3Xw@mail.gmail.com>
In-Reply-To: <CAOc6etaCz=JWPnk2Jv8KYG02xBN+jZG1EfbnwtKnq_A0UBUpEg@mail.gmail.com>

On Sat, Mar 4, 2023 at 3:57 AM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
>
> On Sat, Mar 4, 2023 at 12:45 PM Edmundo Carmona Antoranz
> <eantoranz@gmail.com> wrote:
> >
> > Usercase can be at the moment trying to rebase (with merges) on top of
> > an exact base copy. In cases like this, git just crashes on merge
> > commits. An easy example:
>
> I should have said _crashes on merge commits where there was a conflict_.

Crash tends to mean the program has done something not allowed by the
operating system.  I don't think that's what's happening here.  Do you
mean Git stops with conflicts?