In UCM it's common to handle all merge and situations by starting etiher a rebase or deliver operation. But occasionally it's feasible to do manual - old fasion, non-UCM - merges without having the UCM meta-data being updated with the notion that something is either delivered or rebased.
At least one scanario is when you want to survive an Evil Twin.
One approach to hand-held merges is to bring up the version tree of an element and toss the version from branch to branch. This approach works only on one single element at a time. The pros about this approach is that it's intuitively quite easy to use and. The cons is that if you are dealing with more then just a few files it starts to categorize as tedious work, and if your merge involves several levels of directories then there are other approaches that are more interesting.
See Howto merge using the ClearCase Merge manager or Howto merge using the cleartool findmerge command for alternative approaches.
How do I use the version tree browser to survive a potential evil twin?
...is to identify which version you want to merge from. If an Evil Twin trigger is installed in your environment this information ought to be part of the error message, and then it's easy enough, alternatively you must go and search for it - simply by comparing versions again version in the version tree (not always so funny).
Have a look at the error message to the right (click on it to see it full-size). This is the error generated from the Evil Twin trigger in the Acclerated ClearCase Open Source project.
Error occured when I created a file called
Error message says:
The name: [Array.h]
ALREADY exists for the directory:
The name was added in branch version:
So the last line tells me which version to merge from.
What you see there now in the view is that my
If you just simply want the content of the Array.h file to resemble the Array.h.keep file which was you first attempt to add to source control then simply:
From the command prompt you could do:
> cleartool ci -nc Array.h
> del Array.h.keep
Just remember that the