From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDF18C433DB for ; Wed, 23 Dec 2020 19:46:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A886223E4 for ; Wed, 23 Dec 2020 19:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728789AbgLWTqe (ORCPT ); Wed, 23 Dec 2020 14:46:34 -0500 Received: from pb-smtp2.pobox.com ([64.147.108.71]:56613 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728497AbgLWTqe (ORCPT ); Wed, 23 Dec 2020 14:46:34 -0500 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 2592A98D25; Wed, 23 Dec 2020 14:45:52 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=omC/PhX5H3O+Mv7+v3pf8QpAY0g=; b=ozLvWe EjZoudLndJBtcB6FLt4FyBNKXrQjgyVfq4Jtk65dx0mBDHh+b3rxZjs28YWIy0/W ZeNFgvxlh9H+fh2T0TgFl2oxtBH8HZlU5fcPDY8mAHx13RlcWnNuTkzieBnSvJFr I/IXnBZZUCdSP251rTNRKc71IV+cghNGS3OXA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=LbkFyRIKTLvKJZDfRkQptoEv5zDHURzI sGgEhmIXzw3YrK3OTguU97LhFs2sL9VVswOIT0MnMe7AkuiapeG8j9ilH8WmP0Qo UNCSzzlIK+/yeHp9RaUub/rbJ/N2L5aj6tnAX+nN6StZI8PHTyASk8T6/aExUieX MSd4wQz1BZE= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 1BEBA98D23; Wed, 23 Dec 2020 14:45:52 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 8FF4B98D22; Wed, 23 Dec 2020 14:45:51 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Matt Turner Cc: gentoo-portage-dev@lists.gentoo.org, git@vger.kernel.org Subject: Re: [RFC PATCH gentoolkit] bin: Add merge-driver-ekeyword References: <20201221034452.307153-1-mattst88@gentoo.org> Date: Wed, 23 Dec 2020 11:45:50 -0800 In-Reply-To: (Matt Turner's message of "Tue, 22 Dec 2020 17:40:29 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 7669D91C-4557-11EB-9215-74DE23BA3BAF-77302942!pb-smtp2.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Matt Turner writes: > I want to handle conflicts automatically on lines like > >> KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" > > where conflicts frequently happen by adding/removing ~ before the > architecture names or adding/removing whole architectures. I don't > know if I should use a custom git merge driver or a custom git merge > strategy. A merge strategy is about how the changes at the tree level are handled. A merge driver is given three blobs (original, your version, and their version) and comes up with a merged blob. In your case, you'd want a custom merge driver if you want to handle word changes on a single line, because the default text merge driver is pretty much line oriented.