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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 4BA8D1F4D7 for ; Tue, 26 Apr 2022 16:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352847AbiDZQQ1 (ORCPT ); Tue, 26 Apr 2022 12:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352852AbiDZQQV (ORCPT ); Tue, 26 Apr 2022 12:16:21 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 029B79D074 for ; Tue, 26 Apr 2022 09:13:13 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 84FBA127498; Tue, 26 Apr 2022 12:13:11 -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=EU+IFlxvxgzIXp8ehwFkvb4pNM4h5kdEG4sLD5 zKOZM=; b=KUekBmflZi3QMIvlLuB4ZcWUiKg70VbMebbkZ/6dprWVJC242WykeA avl++6ip8aIGryCHc56OlMvRKYbWp9ND1CtIa7Sb3Na1ha2HVYfOLeYb6fmIk3ut hAGaemVgq8F3znTgloDK2NM9aFM+hVKKu7B3MIZpZfbJw7wSkOA8I= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 779BB127497; Tue, 26 Apr 2022 12:13:11 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.105.84.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 9F29C127496; Tue, 26 Apr 2022 12:13:09 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Matthieu Moy Cc: Guillaume Cogoni , Jonathan , BRESSAT JONATHAN p1802864 , "git@vger.kernel.org" , "guillaume.cogoni@gmail.com" Subject: Re: [PATCH v1 0/2] Be nicer to the user on tracked/untracked merge conflicts References: <20220425202721.20066-1-git.jonathan.bressat@gmail.com> <243b40ef-a720-46aa-6657-87ac8d3c3bdc@univ-lyon1.fr> Date: Tue, 26 Apr 2022 09:13:06 -0700 In-Reply-To: <243b40ef-a720-46aa-6657-87ac8d3c3bdc@univ-lyon1.fr> (Matthieu Moy's message of "Tue, 26 Apr 2022 08:38:43 +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: C3B563D0-C57B-11EC-B6B3-5E84C8D8090B-77302942!pb-smtp1.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Matthieu Moy writes: > Git very rarely goes interactive like this (only a few special command > like git send-email, git clean -i, git add -i/-p prompt the user). > > Prompting the user in the middle of an operation has several drawbacks: > ... > In this particular case, actually, I can't imagine a sane behavior > when the user wants a mix of "yes" / "no". If a single untracked file > conflicts with what's being merged, the merge aborts, even if you're > OK to replace other files. So I can only imagine a single yes/no > answer. And then the question can be replaced with a suggestion to > re-run with a command-line flag when all the conflicting files are > unmodified. Nicely explained. Thanks.