git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Documentation bug (?) when describing `zdiff3` merge format

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 8, 2024, 16:19 UTC
Message-ID
<xmqqjzgrj8cf.fsf@gitster.g>
In-Reply-To
<a8bc907a-de6f-4b99-a72c-41dd885fde55@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 5 quoted lines
> This is exactly the problem that zdiff3 has: There is no way to indicate
> that some line in the common ancester was resolved identically and is
> now outside the conflict markers. Do not use zdiff3 if you cannot live
> with this deficiency. This is in fact not made explicit in the
> documentation.

Yes, indeed that is a problem and that is not I personally do not touch it even with a 10ft pole. We might want to stress it a bit more to warn potential users in our documentation.

#leftoverbits then?
Thanks.
Previous: Johannes SixtNext: Kyle Lippincott
Message 3 of 5 in “Documentation bug (?) when describing `zdiff3` merge format”
  1. punk.lion0906@fastmail.comAug 8, 2024
  2. Johannes SixtAug 8, 2024
  3. Junio C HamanoAug 8, 2024
  4. Kyle LippincottAug 8, 2024
  5. punk.lion0906@fastmail.comAug 8, 2024

Read the whole thread, see it on lore, or plain text.

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