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

Johannes Sixt [off-list ref] writes:

Am 30.09.26 um 11:48 schrieb Phillip Wood:

quoted

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

Thanks.