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

Difficulties merging "evil twin" directories/files

I am having difficulties merging directories and files which are added at multiple streams/workspaces before being merged together (described as "evil twins" in the Jazz merge article). I tried following the article at: http://jazz.net/library/article/39#Example_6 and the help at:
Resolving Structural Conflicts.

The UI does not seem to respond as indicated in the article. When I add a file in the same location with different contents in multiple changesets (add file, suspend changeset, new changeset with add file same location, different contents, resume suspended) I do not get a content diff. Instead, the UI only shows the contents of the first changeset on the right hand side.

When I add a directory in multiple changesets and merge them together, I get very little feedback on what will happen depending on the type of merge resolution. The help is pretty vague and when I try out the different options it is difficult for me to get the rationale behind the options.

Could anyone explain to me what should happen depending on the choice I make when I try to merge added directories on the same location from multiple changesets?

Also, is there any way to see the contents and original changesets of the files/directories of the two conflicting changesets when doing this kind of merges?

Thank you in advance for any answer!

0 votes



11 answers

Permanent link
Resuming "Evil Twin" discussion in relevant work item

https://jazz.net/jazz/web/projects/Rational%20Team%20Concert#action=com.ibm.team.workitem.viewWorkItem&id=98654

0 votes

1–15 items
page 2of 1 pagesof 2 pages

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.

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 04 '10, 6:04 a.m.

Question was seen: 21,009 times

Last updated: Dec 18 '12, 4:39 p.m.

Confirmation Cancel Confirm