From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Sun, 05 Mar 2023 13:40:39 GMT
Subject: Re: [RFC PATCH] sequencer - tipped merge strategy
Message-ID: <CAOc6etZeWpxLwkuJM-auhc0N-zu92zYtrMnSjHMGyxvvs2+vEw@mail.gmail.com>
In-Reply-To: <CABPp-BFCNjMsxAcLOxr_9Rnu3n_KL5RMCfD_m7ytS+b_gbd3Xw@mail.gmail.com>

On Sat, Mar 4, 2023 at 9:36 PM Elijah Newren <newren@gmail.com> wrote:
>
> 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?

Ok, sorry for the sloppy wording. Yes, it stops with conflicts.