Visual SourceSafe is asking me to check-in some files, but checking in others automatically

Question

I am using the command-line to merge one project into another. e.g.

ss merge $/XXXXXXXX -GF -R

I am expecting to get outputs like this, these are fine:

A.cpp has been merged with no conflicts.
Check in now?(Y/N)n

An automatic merge has occurred and there are conflicts.
Edit C:\XXXXXXXX\B.cpp to resolve them.

But what about:

C.cpp
Comment for C.cpp:

I am prompted for a comment and then VSS is automatically checking in the files for me. I didn't realise what was happening until I had checked in a few files... why is it doing this on these files rather than asking me first like it does on the other files?

Answer 1

From my further tests, I think that the check-in was done automatically when the merge would be identical to the source file, i.e. the destination is identical to an earlier copy of the source.

Answer 2

on merge, there are three scenarios comparing the source file to the target: the same, different but can be auto merged, and different with conflicts. c.cpp is possibly the first scenario.

Answer 3

Problem with visual source safe merge is that merge is done on the server. That is if visual source safe succeeds on merging file, it automatically check in that files on the server. On the other hand subversion and other source control systems merge files on your local workspace instead of remote server.

See following microsoft articles about Visual Source Safe Merge and How to: Merge File Versions.

At step 10. "Check the database to ensure that the branched file versions have been properly merged."

I automatically check-in to database with default options as it is evident from help document.