Dynamsoft Forums

I have a file in VSS, client has sent me the same file and create their own functions so that now the two files are different. I’d like to merge them. Can anyone give me some advice?

Thanks

You can share and branch the file where you and your customer begin to develop independently, update the branches of the file separately using your file and the client file, and then use Merge Branches command to merge the changes.

If there is any conflicts, the Visual Merge dialog box will appear. Otherwise, SourceSafe will perform auto merge.

Thanks.