Check out Branching Patterns: Final Thoughts and Recommendations by . Here is an excerpt:
Final post in “Branching Patterns”
As I said at the beginning of this long piece: branching is easy,
merging is harder. Branching is a powerful technique, but it makes me
think of goto statements, global variables, and locks for concurrency.
Powerful, easy to use, but…