Re: [PATCH] doc: merge: improve conflict presentation docs

From

Elijah Newren <newren@gmail.com>

Date

May 8, 2023, 15:25 UTC

Message-ID

<CABPp-BE4X=uk5E37KYWMZE5W-myRgXMj8fTpVZ7=FF05PoR5iQ@mail.gmail.com>

In-Reply-To

<CABPp-BE50neqaQbE2tTq_=fEM9j_8-cxgj7xKcSfAunoWjsigw@mail.gmail.com>

On Sat, May 6, 2023 at 4:40 PM Elijah Newren <newren@gmail.com> wrote:

>
> On Fri, May 5, 2023 at 6:58 AM Adam Johnson via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> >

[...]

> Everywhere else in the manual we have referred to these as "conflict
> markers", not "merge markers".

[...]

> If we're updating this documentation, perhaps it's time to drop the
> mention of RCS?

[...]

> I dislike the whole "yours" & "theirs" thing.  [...] I'm happy to see
> them used one less place here.

[...]

> "Using real values" [...] seems more likely to confuse them than using a
> descriptive term or even a fake hash (such as "aaaaaaa").

[...]

> The comment you added here about zdiff3 is correct in context,

[...]