Best way for the parallel development with Rational Team Concert
We are implementing our company the parallel development with Rational Team Concert, suppose there are two development teams working on 2 different requirements (Feature 1 and Feature 2) but for the same application, also suppose we have two streams: Development and Integration , developers start developing and delivering change sets associated with Feature 1 and Feature 2 in the Development stream, after we have 30 change sets mixed of both requirements on the development stream and then we take the changes sets associated with each requirement to create a base line on the integration stream, we have the following questions:
- - How do you identify what changes the leader be accept or discard to create the base line on integration stream for Feature 1 and Feature 2?
- - At what point should merge Feature 1 and Feature 2 and how (a technical response)?
- - baselines can be merged?
We consulted the source: http://www.ibm.com/developerworks/rational/library/parallel-development-rational-team-concert/
Accepted answer
From my perspective it makes no sense to develop them on one stream, where you will potentially get changes for different features entangled and thus dependent upon each other and then try to unravel the mess afterwards.
Once you have the features stable and a baseline for it, you could create an integration stream for one of the baselines (final feature stream configuration) and a repository workspace from that configuration. Then you can point the repo workspace to the other feature stream and start accepting the incoming changes, merging them in.
This approach will push merges and integration to the end which is not ideal, but if you want to separate the features later anyway, better do it in the beginning than in the end.
You can compare based on baselines and also merge them using multiple streams and a repository workspace.