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

Re: question about a merge result

From
Jeff King <peff@peff.net>
Date
Apr 30, 2009, 14:26 UTC
Message-ID
<20090430142635.GB23550@coredump.intra.peff.net>
In-Reply-To
<49F99AE3.5090406@gmx.net>
On Thu, Apr 30, 2009 at 02:34:43PM +0200, Michael Gaber wrote:
Show 8 quoted lines
> > So merging 'b1' into master removed the B file even if in branch 'b1'
> > I restored it.
> > 
> > Could anybody explain me why this is the correct behaviour and why not
> > file 'B' is not restored as it was done in branch 'b1' ?
> 
> well, I'd say the thing is, that in b1 there is no change at all to the
> tree anymore, so when applied to master (without B) there is no b restored

That is exactly it. Git's 3-way merge doesn't look at the intervening history at all. It looks _only_ at the two endpoints and their merge-base (well, that is a bit of a simplification, as there may be multiple merge-bases, but it is what is happening here).

-Peff
Previous: Michael GaberNext: Francis Moreau
Message 3 of 7 in “question about a merge result”
  1. Francis MoreauApr 30, 2009
  2. Michael GaberApr 30, 2009
  3. Jeff KingApr 30, 2009
  4. Francis MoreauApr 30, 2009
  5. Björn SteinbrinkApr 30, 2009
  6. Jeff KingApr 30, 2009
  7. Daniel BarkalowMay 1, 2009

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.