It's all about the answers!

Ask a question

Merging of change sets between components created from same baseline


Rao Shines (15944756) | asked Jun 11 '14, 7:30 a.m.
 We have created 2 components (Named - Source Code) from the initial Baseline 1 under 2 different streams X and Y.
Later we have worked on the 2 and created a couple of baselines on the 2 components as below.

We have Baselines 1, 3 and 6 in Component under Stream x
We have Baselines 1, 2, 4, 5 and 7 in Component under Stream Y

Now team wants to have the code integrated to component under Stream Y that is we should have the baselines 3 and 6 present under stream X, what is the best way to merge the code from component present in Stream x which contains baselines 3 and 6.

There is a confusion in this regard since we have component name same but different baselines in different streams- whats the best possible way to merge.

Thanks in Advance.

Accepted answer


permanent link
Ralph Schoon (59.7k23643) | answered Jun 11 '14, 8:01 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
I would suggest to look into

https://jazz.net/library/article/41 ,
https://jazz.net/library/article/40 ,
https://jazz.net/library/article/126 ,
https://jazz.net/library/article/649
maybe
https://jazz.net/library/article/125

Basically you have Only one component (if you did it right) In the context of a stream, the component shows the versions of the files that have been created. If you load a repository workspace from one stream and set the flow target to the other stream, you compare the versions and RTC shows you the differences and assists you with merging them in your repo workspace.

Rao Shines selected this answer as the correct answer

Your answer


Register or to post your answer.