It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Follow this question
Question details

×42,789
×11,931

question asked: Jun 02 '15, 10:23 a.m.
question was seen: 2,038 times
last updated: Jun 02 '15, 7:34 p.m.

Related questions

FAQ - How this Forum works

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

0
David Beange (111●3●59●101) | asked 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.

One answer

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Abraham Sweiss (2.4k●13●31) | answered 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.

Your answer

Register or 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.