From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Apr 2022 16:13:06 GMT
Subject: Re: [PATCH v1 0/2] Be nicer to the user on tracked/untracked merge conflicts
Message-ID: <xmqq35hzsu0d.fsf@gitster.g>
In-Reply-To: <243b40ef-a720-46aa-6657-87ac8d3c3bdc@univ-lyon1.fr>

Matthieu Moy <Matthieu.Moy@univ-lyon1.fr> 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.