Re: [PATCH v4 1/6] doc: add new gitmergeconflicts man page

[Junio C Hamano <gitster@pobox.com>]

"Julia Evans" <julia@jvns.ca> writes:

>> So, let's rewrite the reason a bit more tightly.
>>
>>     since one side removed `banana` while the other side did not
>>     touch, and the same happend to `cherry`, it makes sense to
>>     remove both from the list ...
>
> I tried to edit this (like below) but only ended up removing "probably".
> But "probably" was there for a reason, since this is a made up example
> and in the real world you would really need to apply some judgement
> to know what the right thing to do is. I left it as is.
>
> -side removed `banana` and one side removed `cherry`, it would probably
> -make sense to remove both from the list, like this:
> +side removed `banana` and one side removed `cherry`, it makes sense
> +to remove both from the list, like this:

Are we talking past each other?  I did not mean "probably" was not
tight enough, and probably is probably a good thing to have there.

The value I wanted to bring on the table was to point out that the
changes are not just "one side did something", but "one side did
something where the other side had no opinion on (hence it didn't do
anything)".  It is the basis of how 3-way merge works and helps to
resolve the example for removal of both.