From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 03 Jun 2024 15:42:22 GMT
Subject: Re: [PATCH v3 0/2] rebase -i: improve error message when picking merge
Message-ID: <xmqqh6ea6nj5.fsf@gitster.g>
In-Reply-To: <28796edf-65eb-4f28-8651-af97e00cabc9@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

>> OK.  It would probably have been unnecessary to rebase only for this
>> update.
>
> I agree the conflict is easy to solve but GitGitGadget gets upset and
> refuses to run the ci if it cannot merge the branch into master

Heh.  TIL.  That's a tad unfortunate that we have to let the tail
wag the dog, but OK.