On Thu, 23 Mar 2006, Ryan Anderson wrote: > > Scott Collins (QT evangelist, incredibly smart guy) commented to me > sometime over the summer, that every new SCM was born out of someone's > desire to implement a new merge algorithm. While I think that's too > simple, I think there have been an awful lot of academic SCMs out there. The exact details are lost in antiquity, but I'm sure one of the defining moments in time for CVS was Dick Grune saying "Merges? We don't need no steenking merges! We'll just make branching difficult! Yeah, that's it! Mwhahahhahhaaaa!". The rest is history. [ Really, the sad part is that you're probably right even when it comes to CVS. The #1 feature of CVS as defined by Brian Berliner in his CVS II paper was 'Concurrent access and conflict-resolution algorithms to guarantee that source changes are not "lost"'. ] Linus - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html