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 with different names. These two differences conflict because the model can only contain one of the changed names.
Parent topic: Differences and conflicts between versions of a model
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