All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: punk.lion0906@fastmail.com,  git@vger.kernel.org
Subject: Re: Documentation bug (?) when describing `zdiff3` merge format
Date: Thu, 08 Aug 2024 09:19:12 -0700	[thread overview]
Message-ID: <xmqqjzgrj8cf.fsf@gitster.g> (raw)
In-Reply-To: <a8bc907a-de6f-4b99-a72c-41dd885fde55@kdbg.org> (Johannes Sixt's message of "Thu, 8 Aug 2024 08:49:35 +0200")

Johannes Sixt <j6t@kdbg.org> writes:

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

  reply	other threads:[~2024-08-08 16:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-08  1:22 Documentation bug (?) when describing `zdiff3` merge format punk.lion0906
2024-08-08  6:49 ` Johannes Sixt
2024-08-08 16:19   ` Junio C Hamano [this message]
2024-08-08 17:22 ` Kyle Lippincott
2024-08-08 20:25   ` punk.lion0906

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqjzgrj8cf.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=punk.lion0906@fastmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.