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

Re: Strange merge conflicts against earlier merge.

From
Petr Baudis <pasky@suse.cz>
Date
Nov 11, 2005, 17:32 UTC
Message-ID
<20051111173239.GU16061@pasky.or.cz>
In-Reply-To
<7v64qzozyx.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Fri, Nov 11, 2005 at 06:29:10PM CET, I got a letter where Junio C Hamano <junkio@cox.net> said that...

Show 6 quoted lines
>  - The above turned out to have a risky corner case, especially
>    when one side reverted a patch and the other one did not.  To
>    address this, read-tree was rewritten and 3-way form of
>    read-tree can take more than three trees these days, letting
>    you feed it all the merge base candidates.  This code is used
>    in 'resolve' strategy.

Yes, but what I didn't find out is whether the additional trees result in additional stages, what are the trivial merging rules, how does it play together with git-merge-index, etc. Doesn't seem to be documented either.

Thanks,
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
Previous: Junio C HamanoNext: Petr Baudis
Message 9 of 13 in “Strange merge conflicts against earlier merge.”
  1. Martin LanghoffNov 10, 2005
  2. Petr BaudisNov 10, 2005
  3. Martin LanghoffNov 11, 2005
  4. Petr BaudisNov 11, 2005
  5. Fredrik KuivinenNov 11, 2005
  6. Petr BaudisNov 11, 2005
  7. Petr BaudisNov 11, 2005
  8. Junio C HamanoNov 11, 2005
  9. Petr BaudisNov 11, 2005
  10. Petr BaudisNov 11, 2005
  11. Junio C HamanoNov 11, 2005
  12. Daniel BarkalowNov 11, 2005
  13. Junio C HamanoNov 12, 2005

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.