Re: [PATCH v3 0/2] rebase -i: improve error message when picking merge

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 3, 2024, 15:42 UTC
Message-ID: <xmqqh6ea6nj5.fsf@gitster.g>
In-Reply-To: <28796edf-65eb-4f28-8651-af97e00cabc9@gmail.com>

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

Show 5 quoted lines

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.