How to Merge a File Without Checking it In
  
PSS ID Number: Q138297
Article last modified on 12-19-1995
 
4.00    | 4.00
 
WINDOWS | WINDOWS NT
 

---------------------------------------------------------------------
The information in this article applies to:
 
 - Microsoft Visual SourceSafe version 4.0
---------------------------------------------------------------------
 
SUMMARY
=======
 
In SourceSafe 3.x the only way to Merge a 'Multiple Checkout' file is to
Update the file. If a conflict occurs, then the file is merged to an output
file for the user to resolve all conflict.
 
Visual SourceSafe now gives you the ability to merge changes in to checked
out files, that are multiply checked out, when performing a Get on the
file. This is the Merge on Get feature in Visual SourceSafe.
 
MORE INFORMATION
================
 
The Merge on Get option is enabled by the following setting in the SS.INI
file or through the menu:
 
   Replace_Checkout = Merge
 
To enable the Get option by using the menus, click Options on the Tools
menu; then click the Local Files tab, and set "Replace writable files" to
Merge.
 
NOTE: Multiple checkouts must be enabled for the Get option to take effect.
 
When the Merge on Get option is selected, a merge will occur when you use
the Get option on a file that you have already checked out. You will be
required to resolve any merge conflicts after the merge occurs.
 
Note that Visual SourceSafe cannot merge binary files together. This
is by design.
 
For additional information, please see the following article in the
Microsoft Knowledge Base:
 
   ARTICLE-ID: Q132971
   TITLE     : Merging SourceSafe Files
 
REFERENCES
==========
 
Visual SourceSafe Books Online.
 
Additional reference words: vss vbwin 4.00 Windows 95 vss
KBCategory: kbusage kbhowto
KBSubcategory: SourceSafe
=============================================================================
Copyright Microsoft Corporation 1995.
