Re: [PATCH] sequencer: allow disabling conflict advice

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 9, 2024, 19:55 UTC
Message-ID: <xmqqle6rch89.fsf@gitster.g>
In-Reply-To: <570a8736-5552-6279-4aea-8acdf8af50df@gmail.com>

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> Thinking about this more and looking at the code, using 'advice_enabled' in the condition
> instead of using 'advise_if_enabled' for each message has a side effect:
> the text "hint: Disable this message with "git config advice.sequencerConflict false"
> will not appear, which I find less user friendly...

Good eyes.

I agree that you have to do that part yourself at the end of that "if () { ... }" block using turn_off_instructions[] string.

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