Contact us

All times are UTC - 8 hours

   [ 2 posts ] 
Author Message

Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
sensorflo wrote:
How can I know after calling VSSItem.Get with VSSFLAG_REPMERGE whether there was a merge conflict or not?

I believe the SDK of MS VSS doesn't provide the capability to check whether there is a conflict when calling VSSItem.Get.

sensorflo wrote:
I can only think of searching the new files for occurrences of "<<<<<<< ". But that is not really a fast solution. I use Visual Sourcesafe 6.0d.

This is not straightfoward, though I think it's a good solution.

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 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:
Copyright © 2016 Dynamsoft | All Rights Reserved
dynamic designed by Dynamsoft team
Fatal: Not able to open ./cache/data_global.php