To Resolve Differences Between Contributors


The first part of merging contributors is resolving difference between those contributors.

To resolve differences between contributors in Diff Merge:

  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 containing the preferred resolution. (The file or directory changes are reflected in the merge results pane.)
  3. For example, to resolve the current difference, clicking 2 would replace 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 more than one button to include changes from multiple contributor panes. In addition, after you have selected a contributor to resolve the difference, you can edit the merge results pane directly if you want to change the contributor text.

  4. Go to the next unresolved difference.
  5. If you use Resolve and Advance mode, you do not need to navigate between differences manually.

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

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.

Related Topics