Export (0) Print
Expand All

How to: Enable Merging

Visual Studio 2005

Visual SourceSafe supports merging in a variety of ways, as described in Compare and Merge Mechanisms. The following procedure describes how to enable merging.

To enable merging in Visual SourceSafe Explorer

  1. In Visual SourceSafe Explorer, on the Tools menu, click Options.

  2. In the SourceSafe Options dialog box, click the General tab.

  3. In the Use visual merge box, choose one of the following options:

    Yes. Always use visual merging.

    No. Attempt to do an automatic merge first and prompt to resolve conflicts manually only if there are conflicts.

    Only if there are conflicts. Show the merge window if there is a conflict, and otherwise do automatic merge.

  4. Click OK.

To enable merging using an initialization variable

  1. Access your Ss.ini file.

  2. If you want to use visual merging, set the Mark_Merges initialization variable to Yes. To use manual merging, set Mark_Merges to No.

  3. Save the Ss.ini file and close it.

See Also

Community Additions

ADD
Show:
© 2014 Microsoft