From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Jul 2020 23:04:25 GMT
Subject: Re: Improving merge of tricky conflicts
Message-ID: <xmqqft9gjz0m.fsf@gitster.c.googlers.com>
In-Reply-To: <87tuxwimvm.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

> Anyway, my primary point was that I still might wish to do exactly reset
> and start from scratch, and then I miss --conflict option, that in turn
> makes its existence less than 100% less sense than configuration
> variable, my estimation being about 80%.

As with other uses of "update working tree files from elsewhere" use
of "checkout", "--merge/--conflict=<style>" checkout does take
pathspec to specify what paths are to be updated.  Nothing stops you
to give "." (everything under the sun) pathspec there, so I do not
really see the point of insisting "I want to start and redo from
scratch".  

Unless the reason is "because that is the way I am used to", that
is.  Surely, we can start and redo from scratch any operation, not
limited to merges, by removing the entire repository and cloning it
again from scratch.  I am trying to give our users tools to help
them not get into that habit and instead always make forward
progress without discarding work that has already been done.