Troubleshooting
Problem
The IBM Rational Rose RealTime Model Integrator compares and merges model elements and properties. The tool detects conflicting changes to a property between two contributors and allows for one of the properties to be accepted in favor of the other. The source code body for a transition is an example of a single property. To merge the source code bodies of certain properties from two contributors, Model Integrator is capable of using the ClearCase Diff Merge tool if it is available. See the topic called "Using the Rational ClearCase Diff Merge Tool" in the online help. If the IBM Rational ClearCase Diff Merge tool is not available, other comparison and merge tools can be used in a manual process to merge the source code bodies of properties from two contributors. This technote explains this manual process.
Resolving The Problem
Export the value of the property from each contributor and separately merge them using an appropriate tool.
Note: IBM Rational Rose RealTime does not come with a comparison merge tool for source code. A tool for comparing and merging source code should be acquired.
For source code in a transition example, in each contributor perform the following steps.
1. Open the transition specification.
2. On the actions tab, right click within the Code box, and select File > Export to.
3. Save the file with the appropriate extension for a source program.
Refer to the documentation supplied by the vendor of the appropriate merge tool on merging source code to complete the merge as desired.
Pick one contributor to apply the merged source to.
1. Open the transition on the specification.
2. On the actions tab, right click within the Code box, and select File > Import.
3. Choose the merged source file.
Within Rational Rose RealTime Model Integrator resolve the conflict by choosing the contributor with the merged code.
Historical Number
112460790
Was this topic helpful?
Document Information
Modified date:
16 June 2018
UID
swg21119821