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

Re: [IRC/patches] Failed octopus merge does not clean up

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Sep 17, 2008, 15:59 UTC
Message-ID
<20080917155933.GI4829@genesis.frugalware.org>
In-Reply-To
<200809171011.06714.jnareb@gmail.com>
On Wed, Sep 17, 2008 at 10:11:02AM +0200, Jakub Narebski <jnareb@gmail.com> wrote:
Show 17 quoted lines
> >> BTW. does it mean that "git merge a b" might be not the same as
> >> "git merge b a"?
> >> 
> > 
> > No. Git merges all the sub-things together and then merges the result
> > of that jumble into the branch you're on.
> > 
> > Someone might have to correct me on that, but that's as far as I've
> > understood it.
> 
> From what I understand from above explanation, and from thread on git
> mailing list about better implementation of and documenting finding
> merge bases for multiple heads, I think octopus merge is done by merging
> [reduced] heads one by one into given branch.
> 
> This means that "git merge a b" does internally "git merge a; git merge b"
> as I understand it.

Sure, but given that both 'a' and 'b' merged (so none of them is subset of the other, for example so that reduce_heads() would drop one of them) the order of the parents will be different so the resulting commit will differ. The resulting tree will no, I think.

Previous: Jakub NarebskiNext: Andreas Ericsson
Message 16 of 17 in “[IRC/patches] Failed octopus merge does not clean up”
  1. Thomas RastSep 15, 2008
  2. Add test that checks octopus merge cleanupThomas Rast, Sep 15, 2008
  3. Documentation: warn against merging in a dirty treeThomas Rast, Sep 15, 2008
  4. Junio C HamanoSep 15, 2008
  5. Avery PennarunSep 15, 2008
  6. Junio C HamanoSep 16, 2008
  7. Linus TorvaldsSep 18, 2008
  8. Avery PennarunSep 18, 2008
  9. Junio C HamanoSep 19, 2008
  10. Junio C HamanoSep 15, 2008
  11. Thomas RastSep 15, 2008
  12. Junio C HamanoSep 16, 2008
  13. Jakub NarebskiSep 16, 2008
  14. Andreas EricssonSep 17, 2008
  15. Jakub NarebskiSep 17, 2008
  16. Miklos VajnaSep 17, 2008
  17. Andreas EricssonSep 17, 2008

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.