Merging your work
- Audience
- Developers
- Platforms
- Windows, Linux, UNIX
- Process
- UCM, base VersionVault
- Products
- HCL VersionVault
Merging is the action of combining the contents of two or more files or directories into a single new file or directory.
In UCM, the merging of your work from your private work area to the target stream takes place during a deliver or rebase operation when HCL VersionVault encounters differences that require your manual intervention.
In base VersionVault, you merge your work from your development branch to the integration branch when you want to make your changes visible to others on your team. You merge from the integration branch to your development branch when you want to see other developers' changes.
This module covers the following topics:
- Starting the Merge Manager
- Finding files to be merged
- How HCL VersionVault merges
- About trivial and nontrivial merges
The information provided in this module is applicable to Windows and Linux and UNIX.