Conflict types

There are various types of Rational® Synergy work area conflicts.
The various types of Rational Synergy work area conflicts and the situations in which they occur:
  1. Work area change to a working object.

    You have an object in the working state and make a work area change to that object. For example, you changed a file in the file system.

  2. Database change to a working object.
    You have an object in the working state and the database gets updated by one of the following ways:
    • A location other than the work area where the working object is located.
    • A different work area, because you might have two work areas.
    • The database source cache file, which is updated outside of control by Rational Synergy.
  3. Work area change to static object.

    You change the permission of a file in the work area to a writable mode and then modify the file outside of Rational Synergy control.

  4. Database change to static object.

    The database source cache file for an object in a non-modifiable state is updated outside of Rational Synergy control.

  5. File changed in multiple locations.

    Both the database source cache file for an object and the work area file for an object are modified. The object can be in a working or static state. For more details on this conflict, please see the following on the web: http://www.ibm.com/support/docview.wss?uid=swg21971694

  6. Files missing from the work area.

    The work area file for an object controlled by Rational Synergy is missing from the work area. The object can be in a working or static state.

  7. Uncontrolled files.

    Files or directories in the work area are not controlled by Rational Synergy.

  8. Files in error.

    Files under Rational Synergy control are in error. This type of error is related to link-based work areas. You must resolve the conflict manually. You can rename or delete the file.

  9. Work area change to checked-in file, but file contents are the same.

    This applies to version 7.2.1.3 or later. You change the permission of a file in the work area to a writable mode and then modify the file outside of Rational Synergy control. However, there are no changes to the contents of the file, except a change to the timestamp of the file.

You can also choose not to resolve the conflicts.


Feedback