Mark_Merges Initialization Variable

See Also

Indicates whether VSS should make a note of all merges, including those with no conflicts. The default is No.

Syntax

Mark_Merges = {Yes|No}

Example

Instructs VSS to note conflict areas only:

Mark_Merges = No

Remarks

When you merge two files and a conflict occurs, VSS creates a temporary file with marks for all the conflicts. If you set this variable to Yes, VSS marks all the changes it has detected and merged, including those that did not result in a conflict of any kind. It also makes each mark more explicit, by showing the original code as well as the two changed sets.

If you set this variable to No, VSS marks only the changes that conflict. It uses conflict markers to indicate the changes so you can resolve the conflicts.

You can also set this variable in your SS.INI file by using the Display All Changes After a Merge option on the General tab in the SourceSafe Options dialog box.