You can merge versions of a model that were developed in parallel to resolve the conflicts between them.
A merge typically starts when you check in a model to a configuration management system and a newer version of the same model already exists in the repository. At the start of the merge, all non-conflicting differences and trivial conflicts are resolved automatically. You must then manually resolve the remaining conflicts by selecting a version of a model from which to accept changes. After you resolve the remaining conflicts, you can save the merged model and close the merge editor.
Resolving all conflicts between versions of a model
When you merge versions of a model, you can resolve all conflicts in one action by accepting all changes from a single model version.Resolving specific conflicts between versions of a model
When you merge versions of a model, you can resolve conflicts individually by accepting specific changes from different model versions.Accepting or rejecting differences from a version of a model
When you merge models, you can accept or reject any differences from a version of a model.
Parent topic: Comparing and merging versions of a model
Related concepts
Comparing versions of a model to find differences