You can now combine models that are not related by a common ancestry, such as independently created models. For example, modelers might want to assemble several models created informally at the beginning of a project into a formal set of models that can be managed with version control.
This feature is also used when you apply a transformation to update a conceptual model from Java or C++ code.
When CVS flags a conflict, you can accept all non-conflicting changes from two contributors with a single button click. This improvement makes it quicker to perform CVS merges.
UML notational diagrams used in code visualization and modeling are no longer merged by picking one side of the conflict. Now, you can merge notational changes individually just you can do with diagrams in a model file.
As you are learning how to manage merges, you can proceed far into a merge only to realize that the approach is incorrect and that you need to start again. This can be very inconvenient, especially in the middle of a ClearCase operation, because ClearCase merges all artifacts in sequence and interrupting and restarting the flow can be tedious. By using the new revert session button, you can now restart the merge without exiting the merge application.
The diagram delta groups are now augmented by the model, diagram and fragment views, each of which is further grouped hierarchically by UML packages. This feature allows you to accept and reject changes at any package level in the hierarchy.
During a long ClearCase operation, such as when you deliver many changed artifacts, you can now validate each model merge after the merge completes but before committing the update to ClearCase. You need not remember which models need validation after a long delivery operation, but rather you can perform the validation immediately after the merge while you retain and can recall your decisions.
For multi-line text fields in which scripts or snippets of Java cod are embedded, you can now resolve conflicting changes by merging these fields. You no longer need to discard work from one side of the merge.
CVS integration in Rational modeling products supports a new CVS feature that enables you to synchronize the workspace with the repository in a logical model mode. This feature reports conflicts at the model level rather than at the fragment level, which enables you to merge the entire model instead of merging individual artifacts.
This feature improves the overall merge experience as each delta and conflict is generated with knowledge of the full model context. This eliminates a common source of corruption: the resolution of related conflicts to opposite contributors.
During a model merge, if a contributor uses a newer version of a profile and the profile is available on the computer that performs the merge, an in-memory upgrade of all contributors to the latest profile version occurs automatically.
In version 6 of IBM Rational modeling products, the merge stops and you must perform the merge manually.