Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

How do I resolve conflicts when delivering from stream to stream.

Questions
Tags
Users
Badges
Bob Ferguson
(89●15●44) Jan 09 '15, 2:53 p.m.

I have RTC 3.0.1 and I am trying to deliver from a development stream to the integration stream.  I am doing this by selecting show pending changes of the Integration stream.  When I do I see changes that I can accept into the Integration stream in the pending changes view.  When I select accept I get an error that states

"Cannot accept changes into the stream since it would create conflicts.  Accept the changes into a repository workspace instead and resolve the conflicts."

How do I do this.  I have a workspace associated with the Integration stream and I do not see any changes to accept.

0 votes

1 answer
3,293 views
0 votes

Accepted answer

Permanent link
Geoffrey Clemm
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER (30.1k●3●30●35) Jan 11 '15, 6:44 p.m.
Change the flow target of that workspace to be the development stream.
Accept all incoming changes from the development stream, merging to resolve conflicts.
Change the flow target of that workspace back to the integration stream.
Deliver all changes to the integration stream.
Bob Ferguson selected this answer as the correct answer

1 vote

Your answer

Register or log in to post 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.

Ask a question
Guidelines
FAQ
Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details

Question asked: Jan 09 '15, 2:53 p.m.

Question was seen: 3,293 times

Last updated: Jan 11 '15, 6:44 p.m.

Confirmation Cancel Confirm