Re: [PATCH v3 03/24] merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 16, 2019, 21:05 UTC
Message-ID: <xmqqtvagzurk.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190815214053.16594-4-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 6 quoted lines

> We always want our conflict hunks to be labelled so that users can know
> where each came from.  The previous commit fixed the one caller in the
> codebase which was not setting opt->ancestor (and thus not providing a
> label for the "merge base" conflict hunk in diff3-style conflict
> markers); add an assertion to prevent future codepaths from also
> overlooking this requirement.

Makes sense.

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