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=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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 45DE81F5AE for ; Thu, 10 Jun 2021 16:01:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230060AbhFJQDI (ORCPT ); Thu, 10 Jun 2021 12:03:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbhFJQDH (ORCPT ); Thu, 10 Jun 2021 12:03:07 -0400 Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 971D6C061574 for ; Thu, 10 Jun 2021 09:01:02 -0700 (PDT) Received: by mail-oi1-x233.google.com with SMTP id m137so2631418oig.6 for ; Thu, 10 Jun 2021 09:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:message-id:in-reply-to:references:subject :mime-version:content-transfer-encoding; bh=RRVBKkxdTUPDA6JT+YCdFKWW+EHArUfOxdpoRjViE+I=; b=c+MnxArEnrkaTLu+zGD8SYn+0/FDonbDIvgQZe03a/IGVODrh58KkUmjFLYqqOyhgq 0M76D6wpfQWTRhNlIcQluH9d985Tw4hgqudLR8ufW5KORXvHWkS/zY2+c+epOo7+Aldi nt5MEmwJuI7NnhOuinYap7nhIyxA9oV0ZVCr5FBQmp1qDCGgQP+LCHe9W2nivgcNyjhJ 7HFIWGaFtVtL7DzR7DjCC/iHCMdvrAfXjCHmWYHFmbVOxEvBsiHzzp2lKqrGKjWnZbJA KXEE7sHmveLnrcPSJTIaxmUdkz0PlXygA5Gk3vTPrfrizE102JAW/xR9I3HyUhJY0Lku HtpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:message-id:in-reply-to :references:subject:mime-version:content-transfer-encoding; bh=RRVBKkxdTUPDA6JT+YCdFKWW+EHArUfOxdpoRjViE+I=; b=gy1Ap/u1jPP9sRJgEjjddeeWLdAhkKTb+SBLU2hfo0LbRihX+hx4lFawlUGTW6pmfQ C8yEbS9dgd+/hOkWKQ67FIXsSie8NJdEGZWtHQKJzBvGdsBQ998ppXIzqXL2+ut84U3G qP5nhTivHjyq8SSrvo9FRVOOK6PlJSAPi/j9oa7nTBDWKncnFzC7pQUuL636EnR0jbUd J5ufKwdAvW81n3IZIgReDdQvHT0X8OYYjSbl8qCht/aCh7MEPiDuC9p0P1n9OE+QtNqq Jrjpync9KqLpCn9zCtJK/4Zb+r7YMfIQju3DVAEmjyhaJiUS4KrS/kvrViVHxp1apZ2L iU9A== X-Gm-Message-State: AOAM531XOlRinYi3k4nEHVDIBgL291OzJNT+52nq99m5B1dxhk77Bgle UXwI94PnVUaQcdjNTTBgDLI= X-Google-Smtp-Source: ABdhPJyCPYlLOxcSpa5maOeX48fiPUhaexVWbI3bUg+guxlnD99WJjM0sdbdvpwYZ0TgitktHWnWNg== X-Received: by 2002:aca:ed0a:: with SMTP id l10mr3986382oih.164.1623340861861; Thu, 10 Jun 2021 09:01:01 -0700 (PDT) Received: from localhost (fixed-187-188-155-231.totalplay.net. [187.188.155.231]) by smtp.gmail.com with ESMTPSA id n127sm611397oif.55.2021.06.10.09.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 09:01:01 -0700 (PDT) Date: Thu, 10 Jun 2021 11:00:59 -0500 From: Felipe Contreras To: Jeff King , Johannes Sixt Cc: Felipe Contreras , David Aguilar , Junio C Hamano , Sergey Organov , Bagas Sanjaya , Elijah Newren , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Denton Liu , git@vger.kernel.org Message-ID: <60c2373b93140_b25b1208c2@natae.notmuch> In-Reply-To: References: <20210609192842.696646-1-felipe.contreras@gmail.com> <20210609192842.696646-8-felipe.contreras@gmail.com> <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org> Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jeff King wrote: > 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/ Geezus. My patches always end up kicking the hornest nest don't they? Maybe it would make sense to revive the zdiff3 patch and attempt to make that the default. That would take a lot of time though, so it wasn't as easy as just flipping a switch from "merge" to "diff3". But there is value in attempting to make the default merge.conflictstyle work for everyone (or last least as many people as possible). It's shinning a light on issues that are already present now. For reference--and since gmane links don't work any more--here are the relevant links for the past discussions: https://lore.kernel.org/git/20130306150548.GC15375@pengutronix.de/ https://lore.kernel.org/git/alpine.LFD.1.10.0808311021120.12958@nehalem.linux-foundation.org/ https://lore.kernel.org/git/1220056963-2352-5-git-send-email-gitster@pobox.com/ Cheers. -- Felipe Contreras