Re: [PATCH 4/5] Documentation: document AUTO_MERGE
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Apr 15, 2023, 08:55 UTC
- Message-ID
- <CAPig+cSYJw3_eJSLr0ygPDj21vcdVK5NT1h_g1PrhA4vM+uiOA@mail.gmail.com>
- In-Reply-To
- <CABPp-BH=LQdjn4yjtCJrPZVHLAZPC0895NYpyUfE92+TKcUsbg@mail.gmail.com>
On Sat, Apr 15, 2023 at 3:08 AM Elijah Newren <newren@gmail.com> wrote:
Show 19 quoted lines
> On Fri, Apr 14, 2023 at 10:08 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
> > On Fri, Apr 14, 2023 at 2:13 PM Philippe Blain via GitGitGadget
> > <gitgitgadget@gmail.com> wrote:
> > > +Notice that the diff shows we deleted the conflict markers and both versions,
> > > +and wrote "Goodbye world" instead.
> >
> > Some grammatical problem here. Perhaps s/and both/in both/, or maybe
> > just drop "and both versions"?
>
> It reads correctly as-is to me. There were five lines dropped:
> * Three were lines starting with '<', '=', and '>' characters,
> referred to as the conflict marker lines.
> * Two were lines containing content from each of the sides ("Hello
> world", and "Goodbye")
> and one line added.
>
> Thus, the diff shows we deleted the conflict markers (the 1st, 3rd and
> 5th lines) and both versions (lines 2 and 4), and wrote "Goodbye
> world" instead.Yes, upon rereading it, I can interpret it in the way it was intended. On my initial read-through, it sounded wrong. Perhaps, had it said "and both versions of the content line" or such, it wouldn't have tripped me up.