About merging in base VersionVault

In a parallel development environment, the opposite of branching is merging. In the simplest scenario, merging incorporates changes on a subbranch into the main branch. However, you can merge work from any branch to any other branch. Automated merge facilities are included for handling almost any scenario.

One of the most powerful HCL VersionVault features is source control of directories.

On a Windows® system, each version of a directory element catalogs a set of file elements and directory elements.

On the UNIX® system or Linux®, each version of a directory element catalogs a set of file elements, directory elements, and VOB symbolic links.

In a parallel development environment, directory level changes may occur as frequently as file level changes. All the possible merge scenarios apply to both directory and file elements. The following merge scenarios are covered in the help:
  • Merging all changes made on a single subbranch
  • Merging selectively from a single subbranch
  • Removing the contributions of some versions on a single subbranch

Merging work from many branches to a single branch is also supported; this is typically a project manager's or integrator's task.

You can merge versions outside of HCL VersionVault, but a merge arrow is not created for you. You must create it manually.