From: Elijah Newren <newren@gmail.com>
To: Adam Johnson via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Adam Johnson <me@adamj.eu>
Subject: Re: [PATCH] doc: merge: improve conflict presentation docs
Date: Mon, 8 May 2023 08:25:04 -0700 [thread overview]
Message-ID: <CABPp-BE4X=uk5E37KYWMZE5W-myRgXMj8fTpVZ7=FF05PoR5iQ@mail.gmail.com> (raw)
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,
[...]
I realized I also failed to note that I like the patch in general and
think it has some good cleanups, even if there are potential further
improvements to make. Looking forward to your reroll.
prev parent reply other threads:[~2023-05-08 15:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-05 13:58 [PATCH] doc: merge: improve conflict presentation docs Adam Johnson via GitGitGadget
2023-05-05 22:35 ` Junio C Hamano
2023-05-07 22:15 ` Felipe Contreras
2023-05-06 23:40 ` Elijah Newren
2023-05-07 22:25 ` Felipe Contreras
2023-05-08 15:25 ` Elijah Newren [this message]
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='CABPp-BE4X=uk5E37KYWMZE5W-myRgXMj8fTpVZ7=FF05PoR5iQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@adamj.eu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).