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

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Oct 1, 2026, 08:45 UTC
Message-ID: <f5397a5c-3482-4207-9501-fec431fa34a0@gmail.com>
In-Reply-To: <223c99ea-64d9-46da-9631-ed8035f1a062@kdbg.org>

On 30/09/2026 21:24, Johannes Sixt wrote:

Show 10 quoted lines

> Am 30.09.26 um 11:48 schrieb Phillip Wood:
>> 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?

I did briefly consider that, but it makes it much harder for other merge strategies such as git-merge-octopus (which I should probably update to write MERGE_LABELS) to store the labels. We already have MERGE_MODE, MERGE_RR and MERGE_MSG storing various bits of merge-related information so this series just follows existing practice.

Thanks

Phillip