During a ClearCase UCM deliver operation of my Rose model, the "Rose Model Integrator" merge tool found dozens of non-trivial merge points. I easily resolved the class/method/argument conflicts, but have spent many fruitless hours trying to figure out how to merge Class Diagrams. Most of the offending conflicts involve elements of the form $UNNAMED$12 which reference nodes which have been deleted (or so says the MergeErrorTool). The most confounding thing is that a single contributor has made 99% of the changes, and yet resolving all conflicts using this contributor still leaves me with dozens of merge errors.
Is there a logical way to go about resolving these conflicts? There must be an easier way! -- Richard Chrenko ************************************************************************ * Rose Forum is a public venue for ideas and discussions. * For technical support, visit http://www.rational.com/support * * Post or Reply to: [EMAIL PROTECTED] * Subscription Requests: [EMAIL PROTECTED] * Archive of messages: * http://www.rational.com/support/usergroups/rose/rose_forum.jsp * Other Requests: [EMAIL PROTECTED] * * To unsubscribe from the list, please send email * To: [EMAIL PROTECTED] * Subject: <BLANK> * Body: unsubscribe rose_forum *************************************************************************
