> I never understood why some people are scared of branching. Well this is branching (in the same way that if..else is branching), just not in the VCS. What's

> I never understood why some people are scared of branching. Well this is branching (in the same way that if..else is branching), just not in the VCS. What's the advantage? This methodology can allow code to go to production for some or all users, either as dark launches ( http://agiletesting.blogspot.com/2009/07/dark-launching-and-other-lessons-from.html http://agiletesting.blogspot.com/2009/07/dark-launching-and-... ) or as production code. VCS branching gives you none of that, and sometimes you need to roll things out sloooowly, either for quality control or for capacity monitoring. > It seems to work pretty well for Linux development. Well for example, if you're following the linux development model for webops, you're almost certainly doing it wrong. I'm sure your website doesn't have release candidates and LTS versions all at different URLs. > As long as you merge continuously from upstream, you're golden. This is not really true either. It's fine if you're the only one on a team following that model, but if everyone on your team follows that model, you're delaying collaboration and causing merge debt. Upstream ends up like a ghost town until someone like you dumps a week worth of work on it just before you're about to dump your week's worth too. > I _do_ have some reservations against #ifdef-sprinkled code. This is definitely a downside! You have to use a lot of discipline to keep this minimal and well-organized.