Dynamsoft Forums

We have the following folder heirarchy in VSS



There are 2 teams working on this code base, lets call them crs and centera.

The release times for both the teams may differ but the code base remains the same.

Say, on mar 10, crs team has updated some files and checking them into VSS. This code needs to be deployed on mar 20. Simultaneously, Centera team is also working on this same code base. This code needs to be deployed on mar 28.
Now there is a risk that when the crs code is deployed on mar 20 it may contain some changes from centera as well. But these centera changes need to go only on mar 28.

To solve this we created 2 branches.




One branch will be used by crs team (Development CRS) and other by centera team (Development Centera) for code development.

Now, say deployment for CRS needs to be done. We will merge the code from Development CRS branch to the main folder (Code) and roll out the release from the Code folder. Same for Centera release.

Can someone please let me know how this merging can be done. Do I manually need to check each and every file and move it to code folder.

Thank you

Hi,

In VSS, you can merge the branches. You can take a look at the following article on how to merge files in VSS:
http://www.kevingao.net/sourcesafe/file-merge.html