The rest of http://codicesoftware.blogspot.com/2010/11/linus-on-branching.html http://codicesoftware.blogspot.com/2010/11/linus-on-branchin... is also interesti

The rest of http://codicesoftware.blogspot.com/2010/11/linus-on-branching.html http://codicesoftware.blogspot.com/2010/11/linus-on-branchin... is also interesting: "It's actually made worse by rebasing. A lot of people end up rebasing on top of such a random kernel (again, just because it's the 'most recent'). It's very annoying." "Not to mention that rebasing easily results in bugs of its own, when you do hit merge conflicts or double-apply something that already got applied (and wasn't seen as a duplicate and merged away automatically, because the code had been further modified since). We had that in the DVB pull request just yesterday." For me, this sounds like a problem with either the tool or the development process. Any thoughts on how to do it 'properly'?