Re: [PATCH v4 0/3] checkout -m: recreate conflict labels
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 13, 2026, 17:34 UTC
- Message-ID
- <xmqqzewhy05i.fsf@gitster.g>
- In-Reply-To
- <cover.1791906474.git.phillip.wood@dunelm.org.uk>
Phillip Wood <phillip.wood123@gmail.com> writes:
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.
Both range-diff and "git diff @{1}" (endstate comparison) looked sensible. I may take a deeper look later on individual patches, but so far this is looking real good.
Thanks, will replace.