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.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS,URIBL_SBL, URIBL_SBL_A 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 89A9D1F5AE for ; Fri, 11 Jun 2021 07:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231177AbhFKHQp (ORCPT ); Fri, 11 Jun 2021 03:16:45 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:60172 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230374AbhFKHQk (ORCPT ); Fri, 11 Jun 2021 03:16:40 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 465F3134CF2; Fri, 11 Jun 2021 03:14:42 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=+/ZIHk7vjPyRhYX45Ds7n0WA+qskWVIOsyVVC9 j1GHU=; b=abfVxSSUAvL5IAa33pTkWy0otDKxForFYzm8J47iqSY9p7rr8313Fr nevj/vgIzmRNaj6oFlkWVLlQe8rQ/u5dIQcW/oVCysPDrqhQa6wPIDaucjtnmWTy jUXy1V/C8T5GEI0XCionH3fuW4ZwD/v6kDNmOI2CXE0BE4Tr+ajAU= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 30818134CF1; Fri, 11 Jun 2021 03:14:42 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [104.196.172.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 636A4134CF0; Fri, 11 Jun 2021 03:14:39 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Johannes Sixt Cc: Jeff King , Felipe Contreras , David Aguilar , 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 References: <20210609192842.696646-1-felipe.contreras@gmail.com> <20210609192842.696646-8-felipe.contreras@gmail.com> <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org> <638a0500-459a-a25b-afca-904ec0e09866@kdbg.org> <07ef3a3b-4812-4fa1-c60c-b9085a268bc3@kdbg.org> Date: Fri, 11 Jun 2021 16:14:37 +0900 In-Reply-To: <07ef3a3b-4812-4fa1-c60c-b9085a268bc3@kdbg.org> (Johannes Sixt's message of "Fri, 11 Jun 2021 09:02:54 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: AF86932C-CA84-11EB-A369-D5C30F5B5667-77302942!pb-smtp20.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Johannes Sixt writes: > The case that inner conflicts are presented sub-optimally under diff3 > remains, though. I agree that until that happens (necessary but not sufficient condition), it is premature to recommend diff3 style to be the default. I notice that "git merge --help" tells what each part separated by conflict markers mean in both output styles, but does not make a specific recommendation as to which one to use in what situation, and it might benefit a few additional sentences to help readers based on what you said, i.e. the "RCS merge" style that hides the original is succinct and easier to work with when you are familiar with what both sides did, while a more verbose "diff3" style helps when you are unfamiliar with what one side (or both sides) did.