Avoiding merge conflicts
Hello:
I'm using RTC 3.0.1.1. I have a user who delivers a changeset to a stream. Next, he manually makes the same changes in a second changeset in a second stream and delivers to that second stream. When I try to merge the changeset from the first stream to the second, I get merge conflicts. In clearcase, I was able to create merge hyperlinks to avoid the conflict. Is there a way to handle this in RTC? Obviously, a little trainnig to show people how to merge the first changeset into the second stream also works, but this doesn't always happen. -Thanks Maggie |
2 answers
Why do you want to deliver the first change set to the second stream? The second change set already did what the first change set did.
An alternative is to deliver the first change set to the second stream instead of recreating the same changes. Your user may also want to read the article on resolving conflicts: https://jazz.net/library/article/39 |
Geoffrey Clemm (30.1k●3●30●35)
| answered Jan 24 '12, 12:08 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Hi Maggie,
RTC does not yet have the equivalent of the CC "add merge hyperlinks" functionality. It is requested in work item 159380. Please feel free to add a comment indicating your interest/support for that functionality. Cheers, Geoff On 1/23/2012 11:08 AM, mstearns wrote: Hello: |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.