From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Date: Tue, 12 Feb 2008 10:48:38 -0800 (PST) > On Tue, 12 Feb 2008, James Bottomley wrote: > > Yes ... I don't do that ... Like I said, I only rebase for an actual > > conflict. > > And this is how things should work. And if conflicts happen every day, what should someone do? This isn't fantasy, that's exactly how things got with the networking tree near the end of 2.6.24. - To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
