From: Julia Evans Date: Mon, 26 Oct 2026 14:47:33 GMT Subject: Re: [PATCH v4 1/6] doc: add new gitmergeconflicts man page Message-ID: In-Reply-To: On Mon, Oct 26, 2026, at 10:37 AM, Junio C Hamano wrote: > "Julia Evans" 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. Oh, I see. This is such a simple example that IMO trying to explain in more detail exactly "why" the resolution is correct risks confusing people. My goal with saying "one side removed 'banana'" is just to give an example of how to read what the merge conflict above is saying, since the syntax might be new to people.