Re: [PATCH] sequencer: allow disabling conflict advice

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Mar 4, 2024, 10:27 UTC
Message-ID: <6a31efcc-c6c2-4729-80b9-eecff4ec9e31@gmail.com>
In-Reply-To: <3df4790a-7ee1-4c72-a3da-ba8a48d546b8@gmail.com>

> We already have "advice.resolveConflict" to suppress conflict advice.

Oh looking more closely that is doing something slightly different - it suppresses advice about pre-existing conflicts in the index when starting a merge etc. 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.

Best Wishes

Phillip

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