Merging versions

If another team member modified and delivered a version of the same file, you must perform a merge operation when you rebase to a baseline that contains the delivered version.

As it does in a deliver operation, DevOps Code ClearCase® merges all nonconflicting differences.

For conflicting differences, DevOps Code ClearCase will prompt you to start the Merge Manager to resolve the conflicts. For information on merging, go to the Merging your work module.