Chapter 13 Comparing and Merging Models
You can define a filter on the merge display if you want to show:
When you are performing a generation or a consolidation, you can use the "Show Only conflicts" filter.
This filter displays conflicts between models with common origin such as local model and consolidated model or origin model and generated model.
A merge conflict occurs when corresponding objects have been modified in both the origin and generated model or the local and Repository model. Such modifications can be a change in object properties, a change in a list of objects, a change in the order of a list or the deletion of an object.
For more information on defining a merge filter, see the "Defining a comparison filter" section.
When you are performing an inter-model generation, you can use the "Hide All Preservations" filter.
This filter hides all differences associated with changes made in the model to be merged as well as all identical objects in order to show only changes made in the model on the left since last generation.
| Copyright (C) 2005. Sybase Inc. All rights reserved. |
| |