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.
Conflicts usually occur for the following reasons:
- Two versions of a model contain changes that
apply to the same object and only one change is correct.
- Two versions of a model contain changes that, if accepted, can
corrupt a model. For example, in model version X, package A became
the parent of package B, and in model version Y, package B became
the parent of package A.