Conflict resolution: update work area from database batch mode

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

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

  1. Work area change to working object.

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

  2. Database change to working object.

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

  3. Work area change to static object.

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

  4. Database change to static object.

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

  5. Object changed in multiple locations.

    The work area file is overwritten with the contents of the source attribute of the database object.

  6. Files missing from the work area.

    The missing work area file or directory is copied from the database to the work area.

  7. Uncontrolled files.

    The uncontrolled files or directories are deleted from the work area.

  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.


Feedback