Conflict resolution: update database from work area batch mode

The batch mode Update database from work area resolves all conflicts by updating the database from the state of the work area.

Each conflict has a conflict resolution strategy. The following list describes what happens when you resolve conflicts by selecting update database from work area batch mode.

  1. Work area change to working object.

    The source attribute of the database object is updated. Work area changes are accepted.

  2. Database change to working object.

    The source attribute of the database object is updated with the contents of the work area file. Database changes are discarded.

  3. Work area change to static object.

    The database object is checked out and the source attribute is updated. Work area changes are accepted.

  4. Database change to static object.

    The database object is checked out and the source attribute is updated with the contents of the work area file. Database changes are discard.

  5. Object changed in multiple locations.

    The database object is checked out and the source attribute is updated with the contents of the work area file.

  6. Files missing from the work area.

    An Unuse operation is performed on the database object associated with the missing work area file or directory.

  7. Uncontrolled files.

    The files or directories are created in the project or directory where they are located. These files are in the working state.

  8. Files in error.

    You can update the work area from the database, update the database from the work area, relink the file (UNIX only), or delete the file.

    Note: Check-out operations can fail if it is not possible to check out the object. When the operation fails, the work area file is left unchanged.

Feedback