Reconcile changes

Reconciling first compares the local instance to the parent, and then generates the list of local changes and calculates the number of changes that are ready to pull from the parent.

About this task

A reconcile occurs automatically whenever you select a parent instance. You may need to manually reconcile after an external disruptive event on the parent instance, such as a clone or failover.

Note: This process may take a while to complete depending on the size and age of the instance.

Procedure

  1. Navigate to Team Development > Team Dashboard.
  2. In the control panel, click Reconcile.
  3. In the confirmation dialog box, click OK.

    The list of local changes that have not been queued or ignored is recreated. If you had previously queued or ignored a local change, that designation is maintained.

  4. (Optional) On the completion page, click Show Results. Review the instance comparison record.
    • The On Remote and not Local related list shows the versions that are ready to pull from the parent.
    • The On Local and not on Remote related list shows the local versions that are ready to queue or ignore.
    Reconcile
  5. Click Team Dashboard.
  6. Pull versions from the parent instance and then resolve any collisions.
  7. Review the local changes list and queue or ignore changes, as appropriate.