From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 28B141F5AE for ; Thu, 10 Jun 2021 13:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230332AbhFJNvF (ORCPT ); Thu, 10 Jun 2021 09:51:05 -0400 Received: from cloud.peff.net ([104.130.231.41]:51312 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230035AbhFJNvE (ORCPT ); Thu, 10 Jun 2021 09:51:04 -0400 Received: (qmail 7794 invoked by uid 109); 10 Jun 2021 13:49:07 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Thu, 10 Jun 2021 13:49:07 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 30348 invoked by uid 111); 10 Jun 2021 13:49:07 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Thu, 10 Jun 2021 09:49:07 -0400 Authentication-Results: peff.net; auth=none Date: Thu, 10 Jun 2021 09:49:06 -0400 From: Jeff King To: Johannes Sixt Cc: Felipe Contreras , David Aguilar , Junio C Hamano , Sergey Organov , Bagas Sanjaya , Elijah Newren , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Denton Liu , git@vger.kernel.org Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle Message-ID: References: <20210609192842.696646-1-felipe.contreras@gmail.com> <20210609192842.696646-8-felipe.contreras@gmail.com> <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org> Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Jun 10, 2021 at 08:41:21AM +0200, Johannes Sixt wrote: > Am 09.06.21 um 21:28 schrieb Felipe Contreras: > > Virtually everyone is using it, and it's one of the first things we > > teach newcomers in order to resolve conflicts efficiently. > > > > Let's make it the default. > > I tested diff3 style the VERY FIRST TIME the other day and was greated > with the below. Needless to say that this change is a no-go from my POV. > [...] I didn't look too deeply at your example, but I suspect it may be related to the fact that diff3 does not try to minimize the conflicts as much (and then the recursive merge on top of that piles on extra layers of confusion). There's a lot more discussion in this old thread: https://lore.kernel.org/git/20130306150548.GC15375@pengutronix.de/ -Peff