Visual Merge Dialog Box
Allows you to visually merge two files. If the merge operation creates conflicts, the file copy to which the changes are being merged is checked out to your working folder, where you can modify it and resolve the conflicts.
Visual SourceSafe does not support merging for binary files. Additionally, you cannot merge one entire project with another.
The merge tool displays the two files and the areas of conflict are highlighted. To resolve conflicts, follow this procedure:
Locate a conflict in the two files by clicking Next Conflict.
Review the differences between the two file versions and choose the change you want to retain in the merge by selecting it. The change is placed in the bottom pane.
Repeat the steps until all the conflicts are resolved.
When you are finished, click OK.
In the Microsoft Visual SourceSafe dialog box, choose Yes to save the file.
In the Accept Merged Result dialog box, click Yes to keep the merged file.
Dialog Box Access
Use the ssexp /merge file_names command.
- Navigate conflicts only
Check to navigate only the conflicts in the files.
- Previous Conflict
Select to go to the previous conflict.
- Next Conflict
Select to go to the next conflict.
- OK
When you have resolved all of the conflicts, select OK to save the file version with the resolved conflicts.
Shortcut Keys
The following table lists the shortcut keys for this dialog box.
| Shortcut Key | Function |
|---|---|
Ctrl+} |
Match brace |
Ctrl+Z |
Undo |
Ctrl+A |
Redo |
Ctrl+Y |
Redo |
Ctrl+S |
Save |
Ctrl+X |
Cut |
Ctrl+C |
Copy |
Ctrl+V |
Paste |
Ctrl+F2 |
Toggle bookmark |
Shift+F2 / F2 |
Prev/next bookmark |
Shift+F3 / F3 |
Search prev/next |
Shift+F7 / F7 |
Navigate changes |
Shift+F8 / F8 |
Navigate conflicts |
Ctrl+T |
Show/hide toolbar |
Ctrl+P |
Show/hide info pane |
Alt+LeftArrow/ Alt+RightArrow |
Resize the difference display panes |