Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

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

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?

like image 344
Mr. Boy Avatar asked Dec 05 '25 15:12

Mr. Boy


1 Answers

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.

like image 144
Mr. Boy Avatar answered Dec 07 '25 16:12

Mr. Boy