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

Re: Newbie question regarding 3way merge order.

From
RBRaimund Berger <raimund.berger@gmail.com>
Date
Jan 31, 2009, 13:26 UTC
Message-ID
<87myd7bo8f.fsf@gigli.quasi.internal>
In-Reply-To
<slrngo771p.b1i.sitaramc@sitaramc.homelinux.net>
Sitaram Chamarty <sitaramc@gmail.com> writes:
[snip] ...
> Rebase *does* do an implicit merge by default (as far as the
> tree that results is concerned, which you mentioned right at
> the start), I'm pretty sure of it.

I'm myself, especially since a conflicting rebase leaves the index in an "unmerged" state. Much like a regular merge does. It's still all assumptions though, or maybe I'm missing documentation .... (?)

> Perhaps someone with more git smarts will chip in with
> something more concrete.

That'd really be awesome. I mean, it's ok for me to dig through source code and find answers myself, but it would really save time if somebody who knows for sure dropped a word or two.

Previous: Sitaram ChamartyNext: Nanako Shiraishi
Message 6 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.