Re: [PATCH v4 0/6] [doc] Add new page on merge conflicts
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 23, 2026, 16:00 UTC
- Message-ID
- <xmqqld7o9zl4.fsf@gitster.g>
- In-Reply-To
- <pull.2237.v4.git.1792764293.gitgitgadget@gmail.com>
"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 8 quoted lines
> @@ Documentation/gitmergeconflicts.adoc (new) > + "cherry", > + "mango", > +||||||| 1c22e48 > ++ "banana", > ++ "cherry", > + "mangoooo", > +=======
Is it intended to use different indentation style for the entries to be removed from the list, or is it a simple mistake?
Show 7 quoted lines
> + "banana", > @@ Documentation/gitmergeconflicts.adoc (new) > +] > +---- > + > ++With this view, you can see that both sides fixed a spelling > ++mistake in "mango", and each removed one fruit to the list.
"removed one fruit *from* the list", no?
I'll block time to read the whole thing over later today. Thanks.