Re: [PATCH 2/2] merge: remember conflict labels

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 1, 2026, 17:14 UTC
Message-ID: <xmqqy0ch5one.fsf@gitster.g>
In-Reply-To: <6e028692-447c-4a21-a9bb-739e42f1c9aa@gmail.com>

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

Show 5 quoted lines

> We
> would perhaps benefit from documenting the common files like 
> COMMIT_EDITMSG, MERGE_MSG, SQUASH_MSG, MERGE_HEAD, FETCH_HEAD and 
> MERGE_LABELS somewhere in gitrepository briefly explaining what they 
> contain and how they are used as a separate series.

Sounds good.

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.