How to branch the source code

khoinh · Post by **khoinh** » Tue Jan 16, 2007 1:20 am

Hi

How can I branch the source code (between different versions)? I need to branch the source code of Iteration 2 from Iteration 3. So while the team developes I3, we continue maintaining I2. Can you show me detail?

Thanks

lbauer · Post by **lbauer** » Tue Jan 16, 2007 9:08 am

See this KB article for best practices for branches:

http://support.sourcegear.com/viewtopic.php?p=29511

Also, Eric Sink's Source Control HowTo has a good overview of branching in development:

http://www.ericsink.com/scm/scm_branches.html

khoinh · Post by **khoinh** » Tue Jan 23, 2007 4:26 am

Hi,

Thank for your responding. We can use "Branch" feature in Vault. However, I have some other questions about "Merge Branch":

#1: When I use "Merge Brach", will changed files in Origin Folder replace to old files in Target Folder?
#2: If #1 is Yes. we develop project in Target folder and fix bug in Orgin folder with same files. Can I have the files that have "fix bug" and "new development"?
#3: Can you explain for me clearly about status "Resolve Merge", "Merged"?

Thanks

lbauer · Post by **lbauer** » Tue Jan 23, 2007 6:14 pm

#1: When I use "Merge Brach", will changed files in Origin Folder replace to old files in Target Folder?

Yes, the Merge Branches will allow you to do that, if you wish.

#2: If #1 is Yes. we develop project in Target folder and fix bug in Orgin folder with same files. Can I have the files that have "fix bug" and "new development"?

You can overwrite or merge a file in the target with the "fixed" file in the Origin. Any new development will remain in the Target folder, as long as your files have different names.

#3: Can you explain for me clearly about status "Resolve Merge", "Merged"?

Resolve Merge is a command to let Vault decide how to merge the files. Sometimes this will not be the merge you want. Be sure to Show Merge on any files that are in a Merge Conflict, so you can choose how to merge.

Merged means that either the user resolved the merge or Vault automatically merged the files (possibly because there were no conflicts).