Re: [PATCH] sequencer: allow disabling conflict advice

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 9, 2024, 19:56 UTC
Message-ID: <xmqqh6hfch7j.fsf@gitster.g>
In-Reply-To: <b52a8678-a13f-455b-a817-2df2b4fab795@gmail.com>

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

>> Maybe just 'advice.mergeConflict' ?
>
> 'advice.mergeConflict' sounds good to me

Yup, looks good to me, too.

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