Re: [PATCH 0/2] checkout -m: recreate conflict labels

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 30, 2026, 20:24 UTC
Message-ID: <223c99ea-64d9-46da-9631-ed8035f1a062@kdbg.org>
In-Reply-To: <cover.1790761727.git.phillip.wood@dunelm.org.uk>

Am 30.09.26 um 11:48 schrieb Phillip Wood:

Show 6 quoted lines

> When "git checkout -m <path>" recreates a merge conflict, it uses
> the labels "base", "ours", "theirs", rather than the labels used by
> the original merge. This short series teaches the ort machinery to
> write the labels to ".git/MERGE_LABELS" when it switches to a merge
> result containing conflicts, so that "git checkout -m" can then read
> that file and use the same labels.

Would an index extension not be a better place to store auxiliary information about merges?

-- Hannes

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