Resolving Conflicts in CAF
Use
When several users work simultaneously on certain project and then try to check in their project to the DTR, conflicts may occur. A check-in conflict occurs when the version that is being checked in is not a direct successor of the currently active version in the workspace. This can happen in the following cases:
· User2 manages to create an activity before User1 does. The conflict can be resolved when User1 synchronizes the project with the latest version of it that exists in the DTR.
More
information:
Managing
Activities
· User 1 and User2 have created their own activities. They can modify the project locally. User2 has checked in the project and the information in the DTR is not up to date. The conflict can be resolved with the merge tool.
Merge conflicts can occur when a number of users modify the same composite application simultaneously and if another user has already checked in the same application. To check in the project, the user first needs to resolve the conflict.
Prerequisites
You have checked in your project to the DTR. You have modified a composite application that is already under version-control within the Design Time Repository (DTR).
Procedure
..
Synchronizing the Project
Open the Composite Application perspective, click your project with the secondary mouse button and choose Team → Sync.
Using The Merge Tool
...
1. Open the Development Infrastructure perspective.
2. Select the conflicting resource you want to check in with the secondary mouse button and choose Resolve Conflict → CAF Resolve.
A three-way merge is displayed. The local version of the project is displayed on the left side of the screen. The conflicting version is on the right side. This is the remote version of the same project.
3. Select one of the conflicting deltas.
A conflicting node enclosed in a blue rectangle indicates it can be automatically merged. If it is enclosed by red rectangle, it cannot.
4. To resolve the conflict, do one of the following:
○
Accept the left
model element of the currently selected node. The left model is the result
model, so nothing has changed. To accept it, choose 
with the
quick info text Accept local.
○
Accept the right
model element of the currently selected node. The right model element is
copied into the left model. To do this, choose 
with the
quick info text Accept remote.
You can restore
the original value of the property on the left side. To do this, select a node
and choose 
with the quick info text Reset Conflict.
5. Open the Composite Application perspective and choose Team → Sync.
Result
You have merged the local version of the project with the remote one.
More Information