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

Newbie question regarding 3way merge order.

From
RBRaimund Berger <raimund.berger@gmail.com>
Date
Jan 29, 2009, 22:25 UTC
Message-ID
<871vulda2r.fsf@gigli.quasi.internal>
Hi guys

I got a dumb question for you to wholeheartedly laugh at, and to which the answer seems to be so self evident. I'd still like a possibly authoritative statement though, just for the books.

The question is whether a (3way) merge is commutative, purely in terms of content (i.e. disregarding commit history for now). Iow if no matter in which order I merge A and B, i.e. A into B or B into A, I'd be guaranteed to arrive at the same content.

If yes, a followup question would be if the merge machinery sitting beneath rebase is exactly the same as that of a standard merge.

The reason I ask is obvious I guess. What basically interests me is if I gave a bunch of topic branches exposure on a test branch and, after resolving issues, applied them to stable, that I could be 100% sure to not introduce new issues content wise just by applying merges in a different order or form (rebase, patch set).

Thanks for feedback, Raimund.
Next: Raimund Berger
Message 1 of 16 in “Newbie question regarding 3way merge order.”
  1. Raimund BergerJan 29, 2009
  2. Raimund BergerJan 30, 2009
  3. Sitaram ChamartyJan 30, 2009
  4. Raimund BergerJan 30, 2009
  5. Sitaram ChamartyJan 31, 2009
  6. Raimund BergerJan 31, 2009
  7. Nanako ShiraishiJan 31, 2009
  8. Raimund BergerFeb 1, 2009
  9. Junio C HamanoFeb 1, 2009
  10. Sitaram ChamartyFeb 2, 2009
  11. Raimund BergerFeb 2, 2009
  12. Johannes SixtFeb 2, 2009
  13. Raimund BergerFeb 2, 2009
  14. Johannes SixtFeb 3, 2009
  15. Nanako ShiraishiJan 31, 2009
  16. Raimund BergerJan 31, 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.