From: Eric Sunshine <sunshine@sunshineco.com>
To: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Elijah Newren <newren@gmail.com>,
Sergey Organov <sorganov@gmail.com>, Johannes Sixt <j6t@kdbg.org>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle
Date: Thu, 2 Dec 2021 08:28:32 -0500 [thread overview]
Message-ID: <CAPig+cRh6BLTqCFRkfspZt+7DnDt4is5=w1AUa6UiBtOYKnBBA@mail.gmail.com> (raw)
In-Reply-To: <df70e408-9355-aff7-c6fe-540b5c687865@gmail.com>
On Thu, Dec 2, 2021 at 3:42 AM Bagas Sanjaya <bagasdotme@gmail.com> wrote:
> On 01/12/21 07.05, Elijah Newren via GitGitGadget wrote:
> > The same as `--merge` option above, but changes the way the
> > conflicting hunks are presented, overriding the
> > `merge.conflictStyle` configuration variable. Possible values are
> > - "merge" (default) and "diff3" (in addition to what is shown by
> > - "merge" style, shows the original contents).
> > + "merge" (default), "diff3", and "zdiff3".
>
> Missing '... (the latter both also shows the original contents)'.
The omission is clearly intentional. The additional text added to the
hunk just above this one (which you snipped), does a better job of
explaining the differences between the styles than this little blurb
did. Moreover, there is insufficient context at this location in the
documentation for a reader to fully understand the difference between
"merge" and "diff3", and the problem of lack of context becomes worse
with the addition of "zdiff3". So, Elijah's choice to drop this blurb
-- leaving just an enumeration of choices -- and elsewhere provide
comprehensive detail about the differences is quite sensible. The
revised text is improved by the loss of the blurb.
prev parent reply other threads:[~2021-12-02 13:28 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 5:16 [PATCH 0/2] RFC: implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-06-15 5:16 ` [PATCH 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-06-15 6:13 ` Junio C Hamano
2021-06-15 9:40 ` Felipe Contreras
2021-06-15 18:12 ` Elijah Newren
2021-06-15 18:50 ` Sergey Organov
2021-06-15 5:16 ` [PATCH 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-06-15 6:21 ` Junio C Hamano
2021-06-15 9:43 ` [PATCH 0/2] RFC: implement new zdiff3 conflict style Jeff King
2021-06-15 19:35 ` Elijah Newren
2021-06-16 8:57 ` Phillip Wood
2021-06-16 10:31 ` Jeff King
2021-06-23 9:53 ` Phillip Wood
2021-06-23 22:28 ` Jeff King
2021-06-17 5:03 ` Elijah Newren
2021-06-15 21:36 ` Johannes Sixt
2021-06-15 21:45 ` Elijah Newren
2021-06-16 6:16 ` Johannes Sixt
2021-06-16 8:14 ` Elijah Newren
2021-09-11 17:03 ` [PATCH v2 " Elijah Newren via GitGitGadget
2021-09-11 17:03 ` [PATCH v2 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-09-15 10:25 ` Phillip Wood
2021-09-15 11:21 ` Phillip Wood
2021-09-18 22:06 ` Elijah Newren
2021-09-24 10:09 ` Phillip Wood
2021-09-18 22:04 ` Elijah Newren
2021-09-24 10:16 ` Phillip Wood
2021-09-11 17:03 ` [PATCH v2 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 0/2] RFC: implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 1/2] xdiff: implement a zealous diff3, or "zdiff3" Elijah Newren via GitGitGadget
2021-09-18 23:02 ` [PATCH v3 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 0/2] Implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 1/2] xdiff: implement a zealous diff3, or "zdiff3" Phillip Wood via GitGitGadget
2021-11-16 2:13 ` [PATCH v4 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 0/2] Implement new zdiff3 conflict style Elijah Newren via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 1/2] xdiff: implement a zealous diff3, or "zdiff3" Phillip Wood via GitGitGadget
2021-12-01 0:05 ` [PATCH v5 2/2] update documentation for new zdiff3 conflictStyle Elijah Newren via GitGitGadget
2021-12-02 8:42 ` Bagas Sanjaya
2021-12-02 13:28 ` Eric Sunshine [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='CAPig+cRh6BLTqCFRkfspZt+7DnDt4is5=w1AUa6UiBtOYKnBBA@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=j6t@kdbg.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
--cc=sorganov@gmail.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 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 NNTP newsgroup(s).