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

Re: [PATCH] Fix read-tree merging more than 3 trees using 3-way merge

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 17, 2007, 02:14 UTC
Message-ID
<7vbqd6j4a0.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.LFD.0.999.0708161750550.30176@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Sorry. I didn't even realize people did this. Oops.

This is no big deal. It would have triggered if you are using resolve strategy _and_ did a multi merge-base merge, the former of which is quite unusual these days.

> What *is* the behaviour for four trees? Reading "unpack_trees()" source 
> implies that all other trees go into stage 1, where the first matching 
> entry is used?

Documentation/technical/trivial-merge.txt describes this under three-way case. Essentially this was an attempt to extend the original merge-resolve so that it would catch problematic criss-cross cases (case #16 in the description).

Previous: Linus TorvaldsNext: Linus Torvalds
Message 8 of 11 in “1.5.3-rc5 regression on OS X?”
  1. Perrin MeyerAug 15, 2007
  2. Junio C HamanoAug 15, 2007
  3. Brian GernhardtAug 15, 2007
  4. Randal L. SchwartzAug 15, 2007
  5. Junio C HamanoAug 15, 2007
  6. Fix read-tree merging more than 3 trees using 3-way mergeJunio C Hamano, Aug 15, 2007
  7. Linus TorvaldsAug 17, 2007
  8. Junio C HamanoAug 17, 2007
  9. Linus TorvaldsAug 17, 2007
  10. Junio C HamanoAug 17, 2007
  11. Linus TorvaldsAug 17, 2007

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.