On Mon, 5 May 2008, Linus Torvalds wrote: > > There are tons of these kinds of merge issues that bad SCM developes > have been masturbating over for YEARS. .. and if I sound rather less than enthused about these kinds of issues, it's because of having seen years and years of people talking about merge strategies, and then at the same time using SVN which doesn't even record the parenthood of the resulting merges, or thinking that code always moves with whole files. In other words, the details don't even matter. What matters is not being a total piece of sh*t in the big picture. Linus -- To unsubscribe from this list: 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