How to Merge files branched using Visual SourceSafe 6.0

[Kalyan]

We are using SourceOffSite (SOS) Client Standard Version 4.0.2 to access the projects in Visual SourceSafe (VSS) 6.0 c .

We have already shared and branched a few folders of the project in VSS. Now the users would like to Merge the modified files from shared/branched project into the original project using SOS.

Currently, the SOS Client GUI shows the Merge command but the sub-menus are not enabled.

Does SOS recognize these sharing and branch operations which were done through VSS earlier?

Do we need to Share and Branch the files again in SOS too?

Any ideas or work arounds appreciated

Thanks

Kalyan

[corey]

SOS 4.0 does not support merging of branches. You will need to use SourceSafe to merge branches.

The Merge menu you see in the SOS Client is for merging conflicting
edits to a checked out file.

[kmamyk]

Hi Corey,

We have a remote team using SourceSafe OffSte for dev and maintenance of a product, and we use branching extensively. The remote team does not have access to Visual SourceSafe, they are working through a firewall.

What process do you suggest the remote dev team uses to merge fixes made in a branch to the main code trunk?
Will the merging of files in different branched ever be added to SSOS?

Regards,
Kliment

[corey]

SOS relies on the Microsoft VSS Automation component for performing operations on the VSS database, and Merge Branches is not implemented by their component.

There is no solution within SOS; merging of changes from the branch into the trunk must be done manually by the developer.