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?
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.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With