The leading provider of version control solution and TWAIN SDK
The leading provider of version control solution and TWAIN SDK

Dynamsoft Forums

Support for Version Control, Bug Tracking and Configuration Management Software
* Login   * Register
* FAQ    * Search

It is currently Wed May 16, 2012 7:07 pm




Post new topic Reply to topic  [ 5 posts ] 
Author Message
 Post subject: "Get latest version" does not merge
PostPosted: Wed Sep 21, 2011 12:57 pm 
Offline

Joined: Wed Sep 21, 2011 12:34 pm
Posts: 7
When I right click a file any choose "Get latest version" and click "OK", it pops up a window asking if I want to "Replace", "Merge", "Leave", "Cancel" and I choose "Merge". But nothing happened. I am sure my local file has conflicts with the one in server (by "Show differences"). I am not using any external merging program. It used to work (It will do auto merge if it can, or open a merge window if it can not solve the conflicts). It is very painful that I need to do manually merge for all files without this auto merge function. Dose anyone know how to fix it? I would really apprieciate it.


Top
 Profile  
 
 Post subject: Re: "Get latest version" does not merge
PostPosted: Wed Sep 21, 2011 1:00 pm 
Offline

Joined: Wed Sep 21, 2011 12:34 pm
Posts: 7
Forgot to mention the version is "Dynamsoft SourceAnywhere for VSS 6.1.1". Thanks


Top
 Profile  
 
 Post subject: Re: "Get latest version" does not merge
PostPosted: Thu Sep 22, 2011 12:36 am 
Offline
User avatar

Joined: Tue Mar 08, 2005 12:23 am
Posts: 1489
Hi ychen,

The "merge" during "Get latest version" only happens when:
1. 2 users A & B have checked out the same file.
2. User A has modified the file and checked it in.
3. User B has modified the file which conflicts with the modification user A has done.
4. User B try to get the latest version of the file from the server.

In other words, the file on the server checked in by user A and the file user B has modified should have different version numbers. Otherwise, the merge won't happen even if there are conflicts.

Is the above your case?

_________________
Catherine Sea
Dynamsoft Support Team
Dynamsoft - The leading provider of version control solution and TWAIN SDK
Source Control Software | Software Configuration Management | SCM Solution | Issue Tracking
SourceSafe (VSS) Remote/Web/Internet Access | SourceSafe (VSS) Replacement/Alternative | SourceSafe (VSS) Hosting|TFS Hosting

Follow me @Twitter, Facebook
Image


Top
 Profile  
 
 Post subject: Re: "Get latest version" does not merge
PostPosted: Thu Sep 22, 2011 10:32 am 
Offline

Joined: Wed Sep 21, 2011 12:34 pm
Posts: 7
Thanks for your reply. Yes, I am pretty sure this is my case. And as I mentioned, it used to work for me.


Top
 Profile  
 
 Post subject: Re: "Get latest version" does not merge
PostPosted: Thu Sep 22, 2011 10:38 pm 
Offline
User avatar

Joined: Tue Mar 08, 2005 12:23 am
Posts: 1489
Hi ychen,

To help us better pinpoint the cause of the issue, you can contact us at livehelp:
http://www.dynamsoft.com/support/livehelp.aspx

Regards,

_________________
Catherine Sea
Dynamsoft Support Team
Dynamsoft - The leading provider of version control solution and TWAIN SDK
Source Control Software | Software Configuration Management | SCM Solution | Issue Tracking
SourceSafe (VSS) Remote/Web/Internet Access | SourceSafe (VSS) Replacement/Alternative | SourceSafe (VSS) Hosting|TFS Hosting

Follow me @Twitter, Facebook
Image


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 5 posts ] 

It is currently Wed May 16, 2012 7:07 pm


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:
Jump to:  
cron

Copyright © 2010 Dynamsoft Corporation. All Rights Reserved. | Knowledge Base | Source Control Blog