Comments on: Branching Strategies: Handling Dependencies Between Branches

By: Dhananjay Goyani

Dhananjay Goyani — Fri, 09 Apr 2010 12:22:30 +0000

Things may go completely different in actual, but this list covers more than 90% cases. Once in a while you come across horrible times and you merely have to apply your logic. Collaboration, as you rightly mentioned, can help a lot.

By: derick.bailey

derick.bailey — Wed, 07 Apr 2010 13:12:11 +0000

@BjartN

yes, i have no doubts about that. that’s something i have been thinking about and exploring for a while now. my current team has some architecture in place that allows us to do this, and i have read about and thought about other ways to handle this, too.

i don’t think it’s an all-or-nothing scenario between branching vs. not. it’s good to have a working knowledge of architectures that let you continue without branching much, and it’s good to have a working knowledge of how and when to branch and merge.

i hope to blog about the types of architectures and processes that allow a team to work on new features without branching, at some point.

By: BjartN

BjartN — Wed, 07 Apr 2010 08:23:08 +0000

Seems like you could avoid all those problems by not branching at all, or having very short lived branches.

That would obviously require discipline when it comes to automated testing and deployment.

Still, it might be worth it.