From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2026 20:31:31 GMT
Subject: Re: [PATCH v3 0/2] checkout -m: recreate conflict labels
Message-ID: <xmqq33ueobto.fsf@gitster.g>
In-Reply-To: <cover.1791537203.git.phillip.wood@dunelm.org.uk>

Phillip Wood <phillip.wood123@gmail.com> writes:

> Changes since V2:
>
>  - only write ".git/MERGE_LABELS" when there are conflicts and added
>    a check to an existing "checkout -m <branch>" test
>  - change write_merge_labels() to take an array of labels
>  - use a local variable to store the internal merge state when writing
>    labels
>  - use strbuf_detach() rather than xmemdupz() when reading labels
>  - add a comment to say we ignore trailing cruft when reading the
>    labels file

These patches looked nicely done.

Will replace.  Thanks.