Conflicts between versions of a model

A conflict occurs in a team development environment when two versions of a model contain differences that cannot both be accepted. For example, two users rename the same class or entity with different names. These two differences conflict because the model can only contain one of the changed names.
Conflicts usually occur for the following reasons:
Note: When you merge sequence diagrams, you must resolve conflicts between interaction components by selecting all changes from only one contributor.
Related concepts
Differences between versions of a model
Composite differences between versions of a model
Related tasks
Accepting or rejecting differences from a version of a model
Resolving all conflicts between versions of a model
Resolving specific conflicts between versions of a model

Feedback