Contact us


All times are UTC - 8 hours



   [ 2 posts ] 
Author Message
   


Joined: Mon Oct 13, 2008 11:33 pm
Posts: 2
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


   


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
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.

_________________
Catherine Sea
Dynamsoft Support Team
Follow us@Twitter, Facebook


Display posts from previous:  Sort by  
   [ 2 posts ] 


Who is online

Users browsing this forum: No registered users and 1 guest


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum

Search for:
cron
Copyright © 2016 Dynamsoft | All Rights Reserved
dynamic designed by Dynamsoft team
Fatal: Not able to open ./cache/data_global.php