In my project we have situations where we branch off from some Mainstream for important milestones like Beta and Release Candidates.
Once we ship the builds to customers, we merge code back to mainstream. This is a simple delivery operation without a rebase.
Now, there are also scenarios when we need to merge some very old stream(almost obsolete) to the Mainstream. I have found two options available:
1)Deliver to Alternative Target
2)Merge Manager
The option 1) is not allowed in our project.
My question is:
What is the difference between the two and why should one be preferred over the other?