Deliver stream to stream Error
Hi,
I want to start using parallel development working on the same vb solution.
So I created 2 streams (Stream A and Stream B). Both streams have the same component (Component1).
I setup flow targer from Stream A to Stream B.
Developer1 has a repository workspace to Component1-Stream A and Developer2 has a repository workspace to Component1-Stream B.
Both can make changes, but if they work on same class (of file) is work cannot be merged in one stream.
This error message appears
CRRTC5042E Cannot deliver changes since they would create conflicts for item '/Prj_IRES/LibEntidad/EntLogin.vb' in component 'Component 'Component 1''. Try accepting all incoming changes, resolve the conflicts, then deliver again.
Am I doing something wrong? should I use two components?
Thanks in advance.
Accepted answer
Comments
Thanks Tim!!
So I need to create repository workspaces to download both "versions" and merge the conflict classes.
In this parallel escenario I want to work, you reccomend to use one component in two streams, or use only one component in both streams?
If you want to merge changes, they need to be changes in the same component ... so you want to keep what you currently have, which is one component that appears in both streams.
Comments
Cesar Sasaki
Jun 28 '13, 1:03 p.m.Good question! I'm looking to work the same way. Hope someone could help us!