git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-mv: improve error message for conflicted file

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 19, 2020, 06:16 UTC
Message-ID
<xmqqr1t89gi8.fsf@gitster.c.googlers.com>
In-Reply-To
<CABPp-BGJdwpwhQUp4Wa4bKBp4hQFB9OM3N1FXH7SzY0mvLDa7Q@mail.gmail.com>
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.

Previous: Elijah NewrenNext: Chris Torek via GitGitGadget
Message 9 of 11 in “git-mv: improve error message for conflicted file”
  1. git-mv: improve error message for conflicted fileChris Torek via GitGitGadget, Jul 17, 2020
  2. Eric SunshineJul 17, 2020
  3. Chris TorekJul 18, 2020
  4. Eric SunshineJul 18, 2020
  5. Junio C HamanoJul 18, 2020
  6. Elijah NewrenJul 18, 2020
  7. Junio C HamanoJul 18, 2020
  8. Elijah NewrenJul 19, 2020
  9. Junio C HamanoJul 19, 2020
  10. git-mv: improve error message for conflicted fileChris Torek via GitGitGadget, Jul 20, 2020
  11. Junio C HamanoJul 20, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.