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

Issue with Delivering Changeset from Stream A to Stream B where some but not all elements in a chanegset trigger a conflict

Questions
Tags
Users
Badges
David Beange
(111●3●64●101) Jun 02 '15, 10:23 a.m.
With RTC 4.0.4 we have an issue when delivering changesets from one stream to another.

The issue concerns a changeset were some of the updates in it trigger a merge conflict to be resolved. We can resolve and get the new correct version of an element.

However we are unable to see how to get the combination of the elements from the original changeset that were not in conflict plus the new resolved versions to be able to deliver that to the new stream.

Can somebody advise please.

0 votes

1 answer
2,516 views
0 votes

One answer

Permanent link
Abraham Sweiss
(2.4k●13●31) Jun 02 '15, 7:34 p.m.
both streams should have their own workspace.  If stream a flows to stream b, then to resolve the conflict have stream a workspace flow the change set to stream b workspace, resolve the conflict and flow the change from workspace b to stream b.

0 votes

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
× 12,023

Question asked: Jun 02 '15, 10:23 a.m.

Question was seen: 2,516 times

Last updated: Jun 02 '15, 7:34 p.m.

Confirmation Cancel Confirm