I have an integration stream with production baseline and several development streams as child streams. Now, when there are independent changes in different streams , it works fine. Now, there is a change in a file in stream A which is delievered to int stream. But, stream B is not aware of this and he makes his changes but when B is delivered to int stream, things dont work because B is not aware of the changes which were done by A and did not take that while writing his code. bOTH dev streams use hijacked files and snapshot view.
I see two solutions here but not sure if it really would work. 1. Merge changes from int to B as soon as A is delivered to int. Here, there could be issue when there is hijack file with changes in same lines. 2.Merge changes from all dev stream to B which does not look good as B may not need alll these changes.
Could you please advise how best to tackle this?
Ideally, you would rebase B with a baseline from int (or, if inconvenient, deliver from int to B), in order to get all changes from int into B, and resolve potential conflict locally (in B UCM view)
Then, and only then, you put a new baseline on B, and deliver that to int.