To resolve differences between contributors

About this task

The first part of merging contributors is to resolve differences between those contributors.

Procedure

  1. Go to an unresolved difference. Click Next Unresolved Difference in the navigation toolbar or the corresponding command on the Navigate menu.
  2. Compare the differences in the various contributor panes. Click the numbered button on the navigation toolbar that corresponds to the contributor pane number that contains the preferred resolution. (The file or directory changes are reflected in the merge results pane.)

    For example, to resolve the current difference, clicking 2 replaces the merge needed indicator in the Merge Results pane with the contributor 2 contents that correspond to that merge point.

    In some cases, you can click multiple buttons to include changes from multiple contributor panes. Also, after you select a contributor to resolve the difference, you can edit the merge results pane directly if you want to change the contributor text.

  3. Go to the next unresolved difference.

    If you use Resolve and Advance mode, you do not need to navigate between differences manually.

  4. Repeat steps 2 and 3 until all differences are resolved.

Results

After you resolve all differences among the contributors to the merge, you can save the merge results. You can resolve these differences in any order, but you must resolve all of them before saving.