From: Junio C Hamano Date: Tue, 13 Oct 2026 17:34:49 GMT Subject: Re: [PATCH v4 0/3] checkout -m: recreate conflict labels Message-ID: In-Reply-To: Phillip Wood writes: > When "git checkout -m " 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.