Best Practice for Merging Between Two Non-Trunk Branches

This forum is now locked, since Gold Support is no longer offered.

Moderator: SourceGear

Locked
hobie
Posts: 13
Joined: Wed Jan 12, 2005 8:37 am

Best Practice for Merging Between Two Non-Trunk Branches

Post by hobie » Mon Dec 11, 2006 5:24 pm

Hi, all.

We're about to add about ten new features as subprojects to our next release effort, and upper management wants to create a branch for each (each with its own DB--yikes). I'd like to know the best practice to handle dependencies that may occur between one or more of the branches. Assuming the branches' code isn't known stable enough to merge both two the trunk and back, what should one do in this case? Yes, I know this is a case of "branch-itis", but it's handed down from On High, so....
I've read some of the recommended docs but haven't seen this addressed. I can provide more detailed info if need be.

Thanks!
Ross

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Post by lbauer » Mon Dec 11, 2006 8:42 pm

We'd need more information to make an informed suggestion.

What is anticipated structure of the folder and subfolders?

Once the branches are created, where will you merge them? Into each other? Will each branch eventually have the same contents?

What types of dependencies are you referring to?
Linda Bauer
SourceGear
Technical Support Manager

Locked