Re: [PATCH v4 10/11] rerere: teach rerere to handle nested conflicts

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 27, 2018, 19:36 UTC
Message-ID: <xmqq4lffk3ez.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180824215619.GH13316@hank.intra.tgummerer.com>

Thomas Gummerer <t.gummerer@gmail.com> writes:

> Fair enough.  I thought of the technical documentation as something
> that doesn't promise users anything, but rather describes how the
> internals work right now, which is what this bit of documentation
> attempted to write down.

That's fine. I'd rather keep it but perhaps add a reminder to tell readers that it works only when the merging of contents that already records with nested conflict markers happen to "cleanly nest".

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.