Parallel conflicts occur when there are parallel
versions of objects in a project. If you find parallel versions in
your project, you can compare and merge the files, and view the history
and properties of the files.
Procedure
- To show parallels:
- For an object or task, right-click the object or task and select Show
Parallels.
- For a task that you are ready to complete, right-click the task
and select Complete.
- For an object that you are ready to check out or check in, right-click
the object and select Check Out or Check
In.
- The Parallels dialog box shows the
merge candidates for the object. Use the toolbar at the top of the
dialog to compare, merge, view history, and view properties.
- You can merge the files or ignore the parallels.