From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Date: Sat, 04 Mar 2023 11:47:04 GMT
Subject: Re: [RFC PATCH] sequencer - tipped merge strategy
Message-ID: <CAOc6etaCz=JWPnk2Jv8KYG02xBN+jZG1EfbnwtKnq_A0UBUpEg@mail.gmail.com>
In-Reply-To: <CAOc6etb9pCXx9S5jxk8Yex++_iai21THU74qdXmOm1XxjHx8Lw@mail.gmail.com>

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_.