Why was merge otpion disabled?
I'm using VS2005/VSS2005 in me copy-modify-merge & multiple-checkout environment.
Our projects are in the beginning stage and many developers frequently update sources.
This is what happened last week. To make it easy, Tom and Chris were the ones.
1. Tom got the latest version and disconnected his IDE from source control database.
2. Tom made changes to a file, for example, error.cs
3. In the mean time, Chris checked out error.cs, modified it and checked it in.
4. When it was time for Tom to apply his changes to source control, of course, he had to connect first.
5. When connecting, it prompted with options either to keep his local copy ("Protect these files against unwanted overwrites") or replace it with the one from source control.
6. Tom chose the first option for sure.
7. Then Tom tried to check out the file. Another prompt shown, with four options. For some reason, the last two options were disabled. Why?
- Check Out the database version, and keep your changes?
- Replace your local file with this version from SourceSafe?
- Check Out the local version, and keep the changes?
-Check Out the local version, and merge the database version with your changes?
8. Tom chose the first option because he didn’t want to lose his change, assuming VSS will prompt when checking in, if there’s any difference.
(In Subversion, Tom should merge at this point, otherwise, he can’t continue.)
9. What happened when Tom tried to check in?
No merge prompt for the difference and he simply replaced the server file with his local version. Chris found it later.
Why were the two options disabled?
How does the option [Check Out the local version, and merge the database version with your changes?] works? Will this merge locally?
Thanks for your help in advance.
