User Guide - MKS

Chapter 10: Branching and Merging Revisions
334
Suspending Merges
Once you have initiated a merge, you can suspend it and then resolve it at
a later time. Suspending merges allows you to mark the working file to
indicate that merging is required. This provides time you may need to
investigate conflicts or difference blocks before finishing the merge.
You can only suspend a merge operation if there are changes since the last
time you saved the merge result.
To suspend merges in MKS Visual Merge
1 In MKS Visual Merge, click the Close button on the status bar.
The Mark for Later Merge dialog box appears.
2 Click Yes to mark the revision for merging at a later time.
In your Sandbox window the member is marked with an unresolved
merge symbol ( ) and in the member information pane
Source Integrity indicates that resolution is required.
To resolve a suspended merge, see “Resolving Merges” on page 336.
u s e r g u i d e