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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 9, 2026, 20:31 UTC
Message-ID: <xmqq33ueobto.fsf@gitster.g>
In-Reply-To: <cover.1791537203.git.phillip.wood@dunelm.org.uk>

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

Show 10 quoted lines

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.