Merge two streams
We want to work in two streams (one is the normal development, one is a bugfix based on a snapshot of stream 1).
Is there a feature to merge the two streams later on(we are working only with base team concert, not ClearCase)? Thanks! |
2 answers
Ralph Schoon (63.3k●3●36●46)
| answered Jun 02 '09, 8:06 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Hello ralf.ovelgoenne,
this is done using the flow target in your repository workspace. Create Repo workspace for one stream then point your flow target to the other stream. This shows the differences on both and allows integrating them once finished and having merged everything you point back to your original sream to integrate the new changes back. There is a fair amount of documentation on jazz.net I think. Ralph We want to work in two streams (one is the normal development, one is Comments How do you prevent an overwrite of a file? I want to merge file changes not overlay. Assume file in stream 2 was changed/delivered after this, a change was made to same file in stream 1. I deliver to stream 1, then point to stream 2 and deliver. I've overlayed my previous change in stream 2.
|
The Jazz library has articles on Multiple Stream Development and Resolving Conflicts that may be of some use for you.
|
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.