What is the best branching strategy for handling three concurrent software releaes.?

Question

What would be an improvement over something like this?
The goal is to prevent developers from making multiple
edits ie. fixing a bug in Main, Rel-1.0 and Rel-2.0

|-----Rel-1.0------Rel-1.1
|
--------------Main
|
|-----Rel-2.0------Rel-2.1

Answer 1

In your particular case (if I understood you correctly), i'd use a pattern called "Codeline per Release" . it will allow you to make merges between the releases and main so developers make the fix to one branch and propagate it (by merging) to the rest.

You can find a detailed description here:

http://www.cmcrossroads.com/bradapp/acme/branching/branch-creation.html#CodelinePerRelease



But what you CAN and CAN'T do depends a lot in which version control system you are using.

Answer 2

Wow, what a complicated answer, vote for the guy above



R3dm0