Managing conflicts upon server deliveries

Rational Team Concert is a collaborative tool. So, an instance can be simultaneously modified by two users. A procedure must then be completed to prevent conflicts when you deliver to the server.

About this task

Two users can modify simultaneously, in their local workspaces, the design of a Program, Screen, or Server. They generate the instance again to take their modifications into account, and then add specific code.

The user who delivers the modifications first does not encounter any problem. However, the other user can check in but cannot deliver the modifications. The delivery attempt fails.

If you encounter this problem, you must complete the following procedure:

Procedure

  1. Accept the modifications that were delivered by the first user.

    A message box indicates that there are conflicts in the component. It proposes to resolve the conflicts automatically or later. Click Resolve later.

  2. Resolve the conflicts on the instance design.
    1. Double-click the line of the instance design (.pacprogram extension for example) in the Pending changes view.
    2. In the compare editor that opens, manage the modifications to keep, add, or delete in the file that is to be delivered. This file is in the left pane (editable) of the editor.
    3. When you are done, click Resolve as merged in the compare editor.

      The compare editor closes and the file is no longer in conflict.

  3. Generate the instance again.
  4. Resolve the conflicts on the COBOL file.
    1. Double-click the line of the instance COBOL file (.cbl extension) in the Pending changes view.
    2. In the compare editor that opens, manage the modifications to keep, add, or delete in the file that is to be delivered.

      The compare editor displays, in its left pane (editable), the COBOL file that was generated after the design modifications of the first user. It displays, in its right pane (proposed, read-only), the COBOL file that integrates your modifications only.

      You must manage the conflicts on the specific code lines only. You must then look into each modification and decide whether it must be added.

    3. When you are done, click Resolve as merged in the compare editor.

      The compare editor closes and the file is no longer in conflict.

  5. Resolve the conflicts on the metadata file.
    1. Double-click the line of the instance metadata file (.cblpdp extension) in the Pending changes view.
    2. Click Resolve as merged in the compare editor, without modifying the file.

      The compare editor closes and the file is no longer in conflict.

  6. Deliver the modifications from the Pending changes view.

Results

The first user can accept the modifications that you delivered.

Feedback