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

Re: Cumulative "git read-tree -m" rejected with overwriting warning

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 13, 2013, 23:40 UTC
Message-ID
<7v1ucj4wbb.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130213230213.GT20333@localhost>
Marcin Owsiany <marcin@owsiany.pl> writes:
Show 5 quoted lines
>  "the index file saves and restores with all this information, so you
>  can merge things incrementally,"
>
> which I took to mean that I can read from multiple trees one by one
> before writing the tree.

That "incrementally" refers to "after a three-way merge stops with conflicts in multiple files, you can start from file A, concentrate only on that file, resolve it, and then go on to resolve conflicts in the next file B, continue, until you resolve the conflicts in the last file Z". Until you resolve a single tree-way merge fully and write the results out as a tree, you cannot merge in the next tree.

That is why N-way octopus is internally implemented as a series of three-way merges.

Previous: Marcin Owsiany
Message 2 of 2 in “Cumulative "git read-tree -m" rejected with overwriting warning”
  1. Marcin OwsianyFeb 13, 2013
  2. Junio C HamanoFeb 13, 2013

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.