RTC Merging Approach
Hi Team,
Having a same component under different stream is mandatory to do auto-merge in RTC ?
This we require to implement parallel Developments , so that Different Teams can commit code separately and at the time of delivering same on Production, we can merge the latest code with the running Stream ( which is already on Production ) . Till now, I m doing it manually by importing the projects from latest and delivering same into running stream .
I googled and found the info about changing the flow targets , but all were suggesting to have Stream and Workspace, No info about components.
So,if I have two streams , S1 and S2 having different components C1 and C2 respectively, where C1 component is added to S1 only and C2 component is added to S2 only, Can auto-merge be done in RTC (by changing flow targets) ? OR any better approach to do same ? Thanks
Accepted answer
Please read some of the articles https://jazz.net/library/#sort=pubDate&project=rational-team-concert&tag=SCM
2 other answers
In general, merging (manual or automatic) is only supported between two versions of the same artifact in the same component. This is true for any merge (whether between two streams, or between a change-set and a stream).
In particular, if two teams are working in different streams on changes that should be merged, they should be working in the same component, not in different components. To fix your currently (broken) situation, you need to pick one of the two components as the "good" component, and then import the versions from that other component into the "good" component. The import would be done by creating an "import" workspace (that contains the initial baseline of the good components and the latest state of the bad components), load the import workspace into a sandbox, remove the good component files/directories, copy the bad component files/directories into the good component, and then check everything in. Once all the bad component files/directories have been checked in to the good components, you can remove the bad components from the import workspace, and then "replace" the stream that had the bad components with the configuration of the import workspace.
Note: Since you are just adding additional information to the same question that you posted a couple of days ago (https://jazz.net/forum/questions/239138/rtc-merging), it is best to either edit that previous question or add a comment to it, rather than asking the same question twice. I've added a comment to that previous question forwarding folks to this thread.