This section provides guidance on how to effectively
compare and merge models in a team development environment.
When team members develop models in parallel,
they compare and merge models to resolve conflicts or differences between
versions of a model. Team members that work with models in a configuration
management system can compare file versions to understand the history
and development of the files. Team members frequently need to merge
files when they develop models in parallel.
Example
Consider the following example,
which shows how multiple team members work in parallel.
In
a repository, model file X is at version 20.
- User
A checks out model file X, version 20, and makes changes to it.
- User B checks out model file X, version 20, and makes changes
to it.
- User A checks in the file and creates model file X, version
21.
- User B attempts to check in the file.
- The configuration management system detects that a newer version
of the model exists in the repository and initiates a merge so that
the changes User B made can merge with the changes that User A made.
- User B resolves the conflicts in the merge.
- User B saves the merged model and completes the check in, creating
model file X, version 22.