This project has moved and is read-only. For the latest updates, please go here.

Merging between multiple release branches

Mar 15, 2012 at 6:12 AM


We have a project which requires maintainig multiple releases at the same time and creating service packs and hotfixes for them. There's no problem with that. We released the first version to the clients in the past and now we're getting ready to release another version while other 2 future version are in development. We're using a branching strategy similar to the mature branching strategy.

Now, my question is how can we merge between multiple release branches? Let's say we need to do a hotfix or service pack for version 1. We'd like to merge the same change to all other releases, e.g. version 1 and 2. We cannot so it using the main branch as it may already be used by future versions, e.g. version 3. So is there any other option apart from doing a baseless merge (which I would like to avoid if possible). Doing code changes in all branches is not possible because of the required effort.

Thank you,


Mar 15, 2012 at 1:51 PM
I have two questions:
1. How many simulatneous releases do you intend to support?
2. How big and complicated are you willing to let hot fixes be before you reject issuing them as a hot fix and require users to upgrade to get the fix in a future version?

David Kreth Allen
“Instead of complaining that the rose bush is full of thorns, be happy the thorn bush has roses.” -Proverb