On 3/2/2012 7:24 AM, sriramak wrote:
yes, we have option for locking the file but multiple people wants
modify the common files from different reason from different Streams
( Target flowing to Main Streams)

WHen they are trying to deliver or accept the changes from Stream 1 to
Main stream or ( Stream2 to Main Stream) its giving conflicts..

so we have to change the flow target to accept on to the workspace and
we have to resolve the conflicts..

please let me know is there any way we can plan the streams to reduce
the conlicts.

No. If developers modify the same file in different streams and then
deliver those changes into a shared stream, there will be a conflict
because those changes need to be merged together.

If you need to avoid conflicts, then you need to stop modifying the same
file in different streams at about the same time. If a file is modified
in Stream #1, then the same file cannot be modified in Stream #2 until
the change from Stream #1 has been delivered to Stream #2.

Hi

I have set Main_Stream as flow target for Stream1 and stream2

but the Stream1 and stream2 modified the same file ( a.txt)

when the flow changes from Stream1 to Main_Stream

I can see changes in Outgong and Incoming, I am not able to accept or deliver..

"Cannot accept changes into a stream since they would create conflicts. Accept the changes into a repository workspace instead, resolve the conflicts, then deliver the merged chanes."

Please let me know the steps to resolve the above issue..

regards,

sriramk

Thanks david,

its very informative.. but we have One Main Stream target for 10 sub
Streams..

but we can see two many conflicts on the stream to stream delivery or
accept conflict..

yes, we cant resolve conflict on stream level... but how to reduce the
conflict...

Regards,
sriramak


daviddlwrote:

Hi

I have set Main_Stream as flow target for Stream1 and stream2

but the Stream1 and stream2 modified the same file ( a.txt)

when the flow changes from Stream1 to Main_Stream

I can see changes in Outgong and Incoming, I am not able to accept
or deliver..

"Cannot accept changes into a stream since they would create
conflicts. Accept the changes into a repository workspace instead,
resolve the conflicts, then deliver the merged chanes."

Please let me know the steps to resolve the above issue..

regards,

sriramk

The error description gives clues as to what needs to be done. You can
only resolve conflicts in a repository workspace. Therefore you must
create a repository workspace flowing with Main_Stream first. Then
you can change the flow target of that repository workspace over to
Stream 1 and accept the change set that modified the same file a.txt.
Now you can perform the merge in such a way that it is acceptable for
Stream1 and deliver the merge back to Stream1. Repeat similar steps
for Stream2.

Note: You could also do the reverse by creating a repository workspace
first flowing with Stream1, and temporarily switch over to Main_Stream
to accept the change set modifying a.txt, make the merge and deliver
back to Stream1.

Also note that it is generally encouraged to deliver changes to
streams through repository workspaces, and not from stream to stream.
This will avoid issues such as this.

yes, we have option for locking the file but multiple people wants
modify the common files from different reason from different Streams
( Target flowing to Main Streams)

WHen they are trying to deliver or accept the changes from Stream 1 to
Main stream or ( Stream2 to Main Stream) its giving conflicts..

so we have to change the flow target to accept on to the workspace and
we have to resolve the conflicts..

please let me know is there any way we can plan the streams to reduce
the conlicts.