Resolving conflicts

This procedure describes how to view and resolve conflicts found in a Workspace.

Before you begin

Ensure that you have completed Creating a Workspace.

To view and resolve conflicts:

1. In the Workspace, from the View tab, click .

   The conflicts are displayed at the bottom in the results pane.

2. Select the conflict you want to view/resolve in the list.

   The folder/job is highlighted in the flow diagram.

3. Do one or all of the following:
   • Click the Tools tab in the ribbon to view versions of the job, as described in Managing versions of a job.
   • Right-click the folder/job in the flow diagram, and select Compare with Predecessor and/or Compare with the Latest Database Version, to compare versions of the folder/job.
   • Resolve the conflict by modifying the folder/job.

   The conflict is resolved.