From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: Jeff King <peff@peff.net>, Johannes Sixt <j6t@kdbg.org>,
"B. Stebler" <bono.stebler@gmail.com>,
git@vger.kernel.org
Subject: Re: Improving merge of tricky conflicts
Date: Fri, 24 Jul 2020 16:04:25 -0700 [thread overview]
Message-ID: <xmqqft9gjz0m.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <87tuxwimvm.fsf@osv.gnss.ru> (Sergey Organov's message of "Sat, 25 Jul 2020 01:11:57 +0300")
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.
next prev parent reply other threads:[~2020-07-24 23:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 23:29 Improving merge of tricky conflicts B. Stebler
2020-07-22 5:50 ` Johannes Sixt
2020-07-22 7:45 ` Jeff King
2020-07-22 17:26 ` Junio C Hamano
2020-07-23 18:25 ` Jeff King
2020-07-24 1:19 ` Junio C Hamano
2020-07-24 19:48 ` Jeff King
2020-07-24 20:18 ` Junio C Hamano
2021-01-16 2:50 ` Martin von Zweigbergk
2021-01-21 14:28 ` Jeff King
2021-01-21 20:30 ` Martin von Zweigbergk
2021-01-21 21:08 ` Jeff King
2020-07-22 20:17 ` Sergey Organov
2020-07-22 21:14 ` Junio C Hamano
2020-07-22 21:20 ` Sergey Organov
2020-07-23 18:26 ` Jeff King
2020-07-23 19:11 ` Sergey Organov
2020-07-23 21:39 ` Junio C Hamano
2020-07-24 5:15 ` Jacob Keller
2020-07-24 6:01 ` Junio C Hamano
2020-07-24 6:53 ` Sergey Organov
2020-07-24 20:30 ` Junio C Hamano
2020-07-24 22:11 ` Sergey Organov
2020-07-24 23:04 ` Junio C Hamano [this message]
2020-07-22 22:48 ` Bono Stebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqft9gjz0m.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=bono.stebler@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).