Branch and Merge (5.0.3)

[Allan Robinson]

Hi,

Any detailed documents regarding Branch (branch file/project, branch the latest version/ a history version) and Merge (merge file, merge project)? It's better if there are some usage scenarios I can refer to.

Thanks.

[lbauer]

We really don't have any detailed documentation, since SourceOffSite doesn't support the type of file/folder branching and merging that is available our Vault product.

Note that SourceOffSite is a remote access client for a SourceSafe database. All source control functionality is determined by Microsoft Visual SourceSafe. Although SourceOffSite has most of the functionality of SourceSafe, there are a few features which it does not support, such as merging a file which has been shared, branched, and modified.

Also, SourceSafe does not support branching and merging projects, just single files.

The Merge feature in SourceOffSite is for merging files which have the Needs Merge status. A Needs Merge status is seen when you have modified a file in your working directory, and the version in the database is updated by another user before you check in your copy.

You could use a SourceSafe Client for branched file merges, although you might have to do this by remoting in to the network where the SourceSafe database resides.

Information about Merge is available in SourceOffSite and Microsoft Visual SourceSafe Help.

Or if you have any specific questions about something you are trying to do in your development process, we would be happy to try to help.

[Allan Robinson]

Linda, I am going to try Vault. Thanks!

[lbauer]

Good idea!

This will help you get started:

http://www.sourcegear.com/vault/eval/