From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 2D5211F44D for ; Fri, 29 Mar 2024 19:21:24 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=cs.washington.edu header.i=@cs.washington.edu header.a=rsa-sha256 header.s=goo201206 header.b=R8cnU+vj; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2BF781C21572 for ; Fri, 29 Mar 2024 19:21:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5D764130E5D; Fri, 29 Mar 2024 19:21:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=cs.washington.edu header.i=@cs.washington.edu header.b="R8cnU+vj" Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA5001EA8F for ; Fri, 29 Mar 2024 19:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711740075; cv=none; b=FwwhQDYethcsQIyVW+D8wsSZkpKDpVdj12u44gqmfvUqGqOst8h3yCRVVA7Qo2QXIReEsFdjyonXlH4Xy3ISuNb1M7+4yRx+hZTmY34mTcQCqzAqJVx7f/gXBja4iWWOJvsoyOle8gihbh7dKrgWImzwv3eCL4LgCkXUNweZcDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711740075; c=relaxed/simple; bh=BPTCvlsUDsdz2DxOif0Gdk9DRVhrRzWGWbv/NQ7ldaA=; h=MIME-Version:From:Date:Message-ID:Subject:To:Content-Type; b=LzvMm+udVbV7wZYkxEfYy0WL66ndxgtJTO7E9Ob1aQKyQ+fMPfzNt3MbY9mtOd9qWtRwpOQrWzu77IGxFUEuf9GiZB8eGA84XHOXJyu2r9OSIIS47Lazf7IFoQJQtJMvTdFzvSXMk1f7IFwi1320VGv7pkVEsDi7IfrkpCIflz8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu; spf=pass smtp.mailfrom=cs.washington.edu; dkim=pass (1024-bit key) header.d=cs.washington.edu header.i=@cs.washington.edu header.b=R8cnU+vj; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d68c6a4630so24278691fa.3 for ; Fri, 29 Mar 2024 12:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1711740071; x=1712344871; darn=vger.kernel.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=b2l2xVghUaRifT4iMsLDvxAnHuTziv6S27kjZ/bQ+WQ=; b=R8cnU+vjYR5bSRoeVY9Dy1LIxApp6j6+GUATIfJ409TTOBWUcxTd8jMYSYcy/EL2hI XspZpIqu1aXfcWq6gxlBPHNo8U2+Dd6JbprhmXUV9S51B6nk+xWn3s/L/ZYCPRJimYvp GjaXkUtgnR+SE1cR9AdOxxGi8xbsq6758xxoE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711740071; x=1712344871; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=b2l2xVghUaRifT4iMsLDvxAnHuTziv6S27kjZ/bQ+WQ=; b=Xt3AwzV6La4lGhcMxfLwO+2iFMSeRRKrRXcNikZT3SL8T2ajokaOa6326zOAvPoTa7 FC6pfVBO5A3m8xCn/m155EkbaZkse0UHFw6p49H72NRjUV0NgXDQbQme4lOk2lfIBXZE CZqIUOYk4fimiaRD4eLG+3u5m9fkXCmEIMmK9wnqpjaXqjbpZgw+aI1AemuwjNtLMyPr RFDOzqAyjH6Er6V54ppUiTlB6g0cpLwkDC7vGSZjaC8BImW/5B37ALlBXK/tocNly6u2 ElZIRmZ07N2qKYoYLi2TWq2pjf2vo4VuKErDvgnkoVoVtHntytyDN+gOeZG+ByHSxN/3 md+w== X-Gm-Message-State: AOJu0YyuMMQFIGR3Khr3dCjbt5bupiUxyElpahQSuMynqC5qpj1PgvRa ANimZ7UkSMzzP58xf+E/mgMRZRKLaOJ9brZh68sMcnZmxrJZFP8PYGW1rnn0yK6rXF25j/GNbIx 5GSEvI9k3sVlUhbsPp9PpYdKuAEFFFSEpBJwmMSThNpbVhXMt9g== X-Google-Smtp-Source: AGHT+IEZyIb8MY+12yoPcZHkgiSyimeeq0HUCK/q2OKZ72EWBQumUJ/OmaIn8IksbQuQmSHrZpzDvWPqCxH67dODqt8= X-Received: by 2002:a2e:8443:0:b0:2d6:d7ff:5d40 with SMTP id u3-20020a2e8443000000b002d6d7ff5d40mr2217894ljh.38.1711740070613; Fri, 29 Mar 2024 12:21:10 -0700 (PDT) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Michael Ernst Date: Fri, 29 Mar 2024 12:20:59 -0700 Message-ID: Subject: Feature request: a merge strategy that makes any file difference a merge conflict To: git@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Git's built-in merge strategies, such as ort, sometimes create a clean-but-incorrect merge. A merge driver or a mergetool cannot be used to correct such problems, because a merge driver or mergetool is only called when the strategy resulted in a conflict (so far as I understand). It is challenging to write a merge strategy, but it is much easier to write a merge driver or a mergetool. If git had a strategy that always caused a merge conflict (even when the differences are mergeable), then a merge driver or mergetool would be called on every file difference. This effectively permits a user to completely replace git's merge strategy, without the difficulty of writing a merge strategy. I realize that the proposed strategy would likely only create merge conflicts when no two of {parent1,parent2,base} are the same -- that is, only when the low-level merge driver `git merge-file` is called. That is fine with me. What do you think of this feature request? Thanks in advance, -Mike