This documentation is archived and is not being maintained.

Mark_Merges Initialization Variable

Visual Studio 2005

Specifies Yes to mark all changes detected during a merge operation, including those that do not represent conflicts. Set this variable to No (default) to mark only the merge conflicts so that you can resolve them.

Mark_Merges = {Yes|No}

During a merge operation, Visual SourceSafe places markings in a temporary file. Visual SourceSafe makes each mark more explicit by showing the original code in addition to the two changed sets. You must remove all change markers before checking in the file or compiling the code.

Specifies that only conflict areas are marked in the temporary file for a merge operation:

Mark_Merges = No