When you merge versions of a model, you can resolve all
conflicts in one action by accepting all changes from a single model
version.
About this task
Attention: To avoid data corruption, do not merge
models outside of the modeling environment.
Procedure
To resolve all conflicts, in the Conflicts page,
right-click Conflicts; then click one of the
following items:- To accept all the changes from the Left Differences page,
click Resolve all with Left Contributor.
- To accept all the changes from the Right Differences page,
click Resolve all with Right Contributor.
- To keep the values of the base model, click Ignore
all Conflicts (Keep Ancestor's Value).