About merging in UCM

During a deliver or rebase operation, the merge algorithm involves the following versions:

  • The source contributors: one version from your development stream and one version from the target stream.
  • The base contributor: the common ancestor of the source versions.
  • The destination version: the merged output, which in a deliver operation becomes a new version in the target stream and in a rebase operation becomes a new version in the development stream.