Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 11, 2021, 06:43 UTC
Message-ID: <xmqqy2bg3nqw.fsf@gitster.g>
In-Reply-To: <638a0500-459a-a25b-afca-904ec0e09866@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

Show 5 quoted lines

> But I would estimate that most conflicts (in absolute number among all
> developers using Git) arise during rebase operations and cherry-picking,
> i.e., while one is working on their own code. In such sitations, the
> simpler conflict markup is sufficient, because one knows the background
> and reason of the conflicts.

"rebase -i" to reorganize one's own series would be a prime example of "conflicts you need to resolve in code that is purely your own and nobody else's", and cherry-picking used while reorganizing one's own series falls into the same category. I agree that a simpler markup would be more appropriate in such cases.

Rebasing to catch up with updated upstream is a different story, though. The same for cherry-picking an earlier change to an updated upstream.