From: Raimund Berger Date: Sat, 31 Jan 2009 13:26:40 GMT Subject: Re: Newbie question regarding 3way merge order. Message-ID: <87myd7bo8f.fsf@gigli.quasi.internal> In-Reply-To: Sitaram Chamarty 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.