Pinned topic Using Team Synchronizing
Answered question This question has been answered.
Unanswered question This question has not been answered yet.
Is there a good reference that shows how to use Team Synchronizing in IDA 7.6.0 when comparing a local data model to a data model Head or Branch in a CVS repository? When the views open that identifies the differences between the local model and the model in repository, I select accept changes from the right and then select Update, but most of the time I get conflict warning error when there is no conflict.
Updated on 2012-04-19T16:58:38Z at 2012-04-19T16:58:38Z by jyeh
Re: Using Team Synchronizing2012-04-17T23:48:27ZThis is the accepted answer. This is the accepted answer.Is it possible that you attach a screen shot of the warning/error message? Also, has the model been checked in to the repository by other people since you last checked out?
Re: Using Team Synchronizing2012-04-18T19:10:43ZThis is the accepted answer. This is the accepted answer.
- rwgoebel 120000QVM3
In step #5, when I select "Update" from the context menu, I receive a prompt asking whether I want to save the changed model or not. If I save the changes, then I will receive the message about conflicting changes. If I don't save the changes, then I don't see the message about conflicting changes and the local model is replaced with the latest changes as well as the revision number. Is this what you experienced also?
I suggest that you always do an 'update' as the first step if a remote change has been detected.
If you have not done any changes to your local file, the 'update' will simply update your local file and its revision. (This is done by CVS.)
If you have already made changes to your local file and some one else has committed a change to the same file, the Team Synchronize perspective's Synchronize view will indicate there are conflicting changes on the file. You can then open the compare editor. The compare editor will automatically resolve all non-conflicting changes. As a result, the editor will be marked as dirty. If there are conflicting changes detected by the compare editor, you can manually accept one in each conflicting change. As you are satisfied with the merged result, exit the editor and save the merged result. After you exit the compare editor, you can then 'mark as merged' on the local file and 'commit'.
Re: Using Team Synchronizing2012-04-18T19:27:29ZThis is the accepted answer. This is the accepted answer.
- jyeh 060000NFJ4
Re: Using Team Synchronizing2012-04-18T22:45:35ZThis is the accepted answer. This is the accepted answer.In step #5 after I select Update, I would then select Yes to the Do you want to Save the Model. So you must select No and the update to the workstation model will occur without conflict. Not very intuitive.
Are there any detail guidelines with images on using Team Synchronizing?
Re: Using Team Synchronizing2012-04-19T16:58:38ZThis is the accepted answer. This is the accepted answer.
- rwgoebel 120000QVM3
There is an article in the developerWorks:
Comparing and merging UML models in IBM Rational Software Architect: Part 4
Most of the article still applies to the IDA models.