Posted a link to this prior blog of mine in article comments also - http://michaeldehaan.net/post/116465000577/understanding-when-to-use-git-rebase http://micha

Posted a link to this prior blog of mine in article comments also - http://michaeldehaan.net/post/116465000577/understanding-when-to-use-git-rebase http://michaeldehaan.net/post/116465000577/understanding-whe... - but I'm a huge fan of rebase and topic branches. One main branch is great, and also if working with a large number of contributors I really like a clean history, and makes things much easier to review. It's kind of a shame something got branded with a slick name like "GitFlow", when "doing it the way you ought to be doing it" doesn't have a slick name :)