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

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 30, 2026, 21:20 UTC
Message-ID: <35417989-d31e-470c-b366-f6632246112b@kdbg.org>
In-Reply-To: <xmqqmrsy8ocd.fsf@gitster.g>

Am 30.09.26 um 22:40 schrieb Junio C Hamano:

Show 15 quoted lines

> Johannes Sixt <j6t@kdbg.org> writes:
> 
>> 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?
> 
> Wow.  MERGE_HEAD, CHERRY_PICK_HEAD, and all others replaced with
> index extensions?

Absolutely not. IIUC, MERGE_LABELS should not be a pseudo ref, but a file carrying auxiliary information.

>  That would unclutter $GIT_DIR/ quite a lot (for
> some reason, I find ORIG_HEAD is a bit of eyesore).  It makes the
> information less accessible, so I am not sure how I feel about the
> proposal, but it is an interesting thought.

I don't know how accessible data in an index extension is. But if it's prohibitively difficult to access, then the idea is dead on arrival.

-- Hannes