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

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 9, 2024, 05:08 UTC
Message-ID: <xmqqh6gb2kdz.fsf@gitster.g>
In-Reply-To: <ZhS-IllueSZa1NXs@tanuki>

Patrick Steinhardt <ps@pks.im> writes:

> So I think it's okay to not mention the exact commit here because we
> cannot reliably second-guess the ultimate extent. My basic assumption is
> that in many cases the user may not even be aware of them trying to pick
> a merge commit, and that it may not have been their intent.

Hmph, if that assumption is really true, would suggesting "merge -C" be the right thing in the first place?

I do not deal with non-linear stuff in "rebase -i" or sequencer, so I may not be a good person to judge how good your basic assumption is, though.

Thanks.

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