Copy-Modify-Merge for VSS

Rich explains how to allow multiple checkouts on a per project basis in Visual SourceSafe.  When you set Multiple_Checkouts to Yes in your SRCSAFE.INI or SS.INI file, you enable the Copy-Modify-Merge collaboration model that is often associated with CVS. When multiple checkouts are enabled in VSS, more than one developer can check out and edit the same files simultaneously.  When you check in your changes, VSS automatically merges your version of the file with any other checkins and, if you and a teammate have changed the same line of code, which is very unusual, VSS provides a side by side comparison of the conflicting versions so that you can decide which change you want to keep.

I described how to enable multiple checkouts for an entire database in a previous post: How To: Edit a File Checked Out to Another User but failed to add the crucial tidbit that you can (thanks Rich) override the default initialization setting for a single VSS project folder in your database, if you want. 

; srcsafe.ini
;
; Global settings

Multiple_Checkouts = Yes

; Project settings

[$/]

[$/Test]
Multiple_Checkouts = No

For background reading, Andy Oakley recently contrasted the Copy-Modify-Merge model to VSS' default Lock-Modify-Unlock. 

++++++++++++++++++++
This posting is provided "AS IS" with no warranties, and confers no rights. Microsoft kann für die Richtigkeit und Vollständigkeit der Inhalte in dieser Newsgroup keine Haftung übernehmen. Este mensaje se proporciona "como está" sin garantías de ninguna clase, y no otorga ningún derecho.