Viewing and Resolving Conflicts

Use this page to view diagnostic messages about errors in your configuration, and to view and resolve conflicts between changes made in your session and other activated sessions. The view conflicts link also displays the number of live conflicts in the session.

Viewing Conflicts
  1. Click View Conflicts under Change Center. The View Conflicts page can display any or all of the following sets of information depending on the nature of the conflicts:
    • Errors (an Error icon denotes non-committable, critical conflicts)-inform you of critical conflicts within your configuration. You cannot commit your changes without resolving the conflicts. See Table 2-6 and Resolving Conflicts.
    • Concurrent Updates (a Warning icon denotes committable, non-critical conflicts)-warn you about incompatible changes with other activated sessions. See Table 2-7.
    • Informational Messages (a Warning icon denotes committable, non-critical conflicts)-inform you of any non-critical conflicts within your configuration.
    • Table 2-6 Errors 
      Property
      Description
      Name
      The resource to which the error message refers. The name is a link to that resource.
      Path
      The project and folder in which the resource resides.
      Resource Type
      The resource type.
      Messages
      A description of the conflict. To resolve the conflict, see Resolving Conflicts.

  2. To display details of a specific conflict, click the link in the Name column for that conflict.
  3. If the object to which you make changes in a session has changed in the run time since you began the edit of the current session, the View Conflicts page displays the information shown in Table 2-7.

    Table 2-7 Concurrent Updates 
    Property
    Description
    Name
    The resource in conflict. The name is a link to that resource.
    Your Changes
    A description of the changes you made to this object in your session.
    Other's Changes
    A description of the changes another user made to this object in their session.
    Synchronize
    Click the Synchronize icon to return this object to the state in which it is saved in the run time.

Resolving Conflicts

To resolve a conflict, use the information provided in the Messages column (as described in Table 2-6) to understand the problem, and then edit the object that is causing the conflict to fix the problem.

For the scenario in which you have a concurrent update conflict-that is, a conflict that occurs if a resource is modified in the current session that has already been modified and activated by another session (as described in Table 2-7), you can resolve the conflict in one of two ways: