From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Chris Torek via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Chris Torek <chris.torek@gmail.com>
Subject: Re: [PATCH] git-mv: improve error message for conflicted file
Date: Sat, 18 Jul 2020 23:16:15 -0700 [thread overview]
Message-ID: <xmqqr1t89gi8.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CABPp-BGJdwpwhQUp4Wa4bKBp4hQFB9OM3N1FXH7SzY0mvLDa7Q@mail.gmail.com> (Elijah Newren's message of "Sat, 18 Jul 2020 18:48:08 -0700")
Elijah Newren <newren@gmail.com> writes:
> Really? Wow. I never had any clue that this was possible and never
> ran across it. Is it documented anywhere?
Probably a test script for "read-tree -m" has a fairly detailed and
comprehensive table of possible scenarios.
Multiple stage #1 entries were introduced to primarily support the
protection against "criss-cross merge" that confuses the history and
it is used by the resolve backend, IIRC.
The implementation of octopus we have does not actually use multiple
stage #3 entries but just does many two-parent merges in sequence.
It started its life as a POC & stop-gap implementation while waiting
for the "real thing" that merges with multiple stage #3 entries, but
it turned out to be good enough for a relatively rare (and now
discouraged mostly due to bisection efficiency reasons) style of
merge and left in that shape until now.
next prev parent reply other threads:[~2020-07-19 6:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 23:24 [PATCH] git-mv: improve error message for conflicted file Chris Torek via GitGitGadget
2020-07-17 23:47 ` Eric Sunshine
2020-07-18 1:35 ` Chris Torek
2020-07-18 6:55 ` Eric Sunshine
2020-07-18 0:07 ` Junio C Hamano
2020-07-18 2:00 ` Elijah Newren
2020-07-18 17:46 ` Junio C Hamano
2020-07-19 1:48 ` Elijah Newren
2020-07-19 6:16 ` Junio C Hamano [this message]
2020-07-20 6:17 ` [PATCH v2] " Chris Torek via GitGitGadget
2020-07-20 18:28 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr1t89gi8.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@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.
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 NNTP newsgroup(s).