To resolve merge differences

Procedure

  1. In Diff Merge, compare the differences in the contributor panes and click the numbered button on the navigation toolbar that corresponds to the contributor pane number containing the resolution that you prefer.

    In some cases, you can click more than one numbered button to include changes from multiple contributor panes. In addition, after you select a contributor to resolve the difference, you can edit the results pane directly.

  2. Click Navigate > Next Unresolved Difference.
  3. Repeat Step 1 and Step 2 until you have resolved all unresolved differences.
  4. Click File > Save and then click File > Exit. On Windows, when you complete the deliver operation, the merge results are checked in.
    Tip: For more information about using Diff Merge, choose a command from the Diff Merge Help menu.