Re: [PATCH] sequencer: allow disabling conflict advice

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 4, 2024, 17:56 UTC
Message-ID: <xmqqy1axq3t1.fsf@gitster.g>
In-Reply-To: <6a31efcc-c6c2-4729-80b9-eecff4ec9e31@gmail.com>

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

> ... So we probably do need a new config variable but
> I think it should have a generic name - not be sequencer specific so
> we can extend its scope in the future to "git merge", "git am -3",
> "git stash" etc.

A very good point.  Thanks for your careful thinking.

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