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

From: Johannes Sixt <j6t@kdbg.org>
Date: Oct 5, 2026, 14:48 UTC
Message-ID: <b2f86941-6ae2-4105-9284-e5e4d530b965@kdbg.org>
In-Reply-To: <cover.1791206658.git.phillip.wood@dunelm.org.uk>

Am 05.10.26 um 15:24 schrieb Phillip Wood:

Show 9 quoted lines

> As "git checkout -m" is recreating the original conflict I wonder
> if we should remember the conflict style as well so that
> 
>     git -c merge.conflictStyle=diff3 git merge topic
>     git checkout -m <unmerged-path>
> 
> would recreate diff3 style conflicts, instead of using the default
> config. I cannot decide if that would be convenient or confusing and
> am interested to hear what others think.

I think it hurts more than it helps. For example, I usually get away with the regular conflict markers, but at times I might decide to see the diff3 version. Then I could change the conflict marker style with

   git checkout --conflict=diff3 -m <unmerged-path>

It would be disappointing if this were not possible.

-- Hannes