Show TOC

Procedure documentationResolving Conflicts in the Component Definition File Locate this document in the navigation structure

 

When a user works with models in source control, the component definition file (.dcdef) of that development component gets modified. When another user works with models of the same development component simultaneously, he attempts to modify the same component definition file.

The user that checks in the activity first has the changes incorporated in the component definition file easily. However, the user that checks in his activity later has to resolve the conflict between his changes with those of the first user.

Prerequisites

  • You have compiled the model and tried to check-in an activity associated with your model.

  • You encountered a check-in error that states Checkin of activity failed due to conflicts.

Procedure

  1. In the Checkin Error dialog box, choose OK.

    Notice that the .dcdef file associated with the component and implementation parts of the development component have not been checked in.

  2. In the Open Activities window, click the .dcdef file in the component part of the development component with the secondary mouse button and choose   Resolve Conflict   Auto Merge.  

    Note Note

    Alternatively, In the Open Activities window, you can click the .dcdef file in the component part of the development component with the secondary mouse button and choose   Conflict   Merge with   XML merge.  

    End of the note.
  3. In the Auto Merge dialog box, select the Mark conflict as resolved after Auto- Merge option.

  4. Choose Auto Merge.

  5. To view the changes made to the component definition file in two consecutive sequences, click the .dcdef file in the component part of the development component with the secondary mouse button and choose View Changes.

  6. In the Open Activities window, repeat the steps 2 to 5 with the implementation part of the development component.

  7. In the Conflict resolution dialog box, choose Yes. The conflict resolution dialog box states that the conflict has been resolved successfully. Choose OK.

  8. You must check-in the activity.

    More information: Checking In a Model