Microsoft KB Archive/181089

= INFO: Dialog Box Appears Even When No Conflicts Exist =

Article ID: 181089

Article Last Modified on 5/1/2001

-

APPLIES TO


 * Microsoft Visual SourceSafe 5.0 Standard Edition
 * Microsoft Visual SourceSafe 6.0 Standard Edition

-



This article was previously published under Q181089



SUMMARY
When you check in a file, the following dialog box is displayed even if there are no conflicts:

Have any conflicts in been properly resolved?



CAUSE
Visual SourceSafe does not know whether there are any conflicts or not. The program recognizes that it is in a merge situation and the user is prompted to resolve any possible conflicts. This is a safety mechanism and if there are no conflicts the user should always select Yes.



STATUS
This behavior is by design.



Steps to Reproduce Behavior

 * 1) Create a text file to use for testing and name the file Test.txt.
 * 2) In Visual SourceSafe have User1 check out and make changes to the Test.txt file.
 * 3) Next, have a Guest user check out the Test.txt file.
 * 4) Now have User1 check in Test.txt.
 * 5) After User1 checks in Test.txt, have the Guest to use "Get" to obtain the latest version of the file.
 * 6) The Guest now checks in the latest version of Test.txt and the dialog box appears.

This behavior is by design and there is not a way to disable this feature.

Keywords: kbinfo KB181089

-

[mailto:TECHNET@MICROSOFT.COM Send feedback to Microsoft]

© Microsoft Corporation. All rights reserved.