Contact us


All times are UTC - 8 hours



Post new topic Reply to topic  [ 2 posts ] 
Author Message
Offline Profile  


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
Hi AmazingTrans,

Quote:
During check-in, we have option to merge the file, and definitely either or will lose their codes if the codes overlap.

For merge-able files like *.c, *.html, *.vb, if 2 files have any conflicts, VSS will display the Visual Merge window when you try to check in 1 copy after the other copy has been checked in. Just as you can see in the link http://msdn.microsoft.com/en-us/library ... 60%29.aspx. So you will need to decide which modifications stay in the final version.

Quote:
Is it possible before the merge, the programmer can call a function somewhere in VS to compare their local code with the master version?

I think you are talking about "Show Difference"?

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


Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 2 posts ]  Moderators: Robert, Catherine


Who is online

Users browsing this forum: No registered users and 0 guests


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