Issue with redoing clearcase ucm rebase

Question

I did a rebase of one stream from its parent and there were conflicts. So, I resolved the conflcits manually but selected wrong versions of some files while resolving conflcits and rebased was completed. is this possible to redo this again or I have to manually merge the files one by one to get correct version ? this is for clearcase-ucm

Answer 1

I don't think this is easily done on your existing stream.

That means:

• either you can recreate another child stream, based on the same foundation baseline as the one stream you used for your rebase, and try again in that new child stream
• or, if this is only for a few files, get an older version of those files (or use a separate dynamic view), and merge them manually.
  If needed, you can add red merge arrow later to mark the merges between the source and destination versions of those files.