After creating and working in a CVS branch for some time, you may want to merge your changes from the branch into another branch, or into HEAD. To do this, you will need to know:
To merge your changes:
Tip: If you don't know the start point of the merge, you can choose to perform the merge directly into the workspace. This relies on the CVS server to pick an appropriate start point. Because the merge is performed directly into the workspace, CVS may introduce a text based conflict markup into the file. This markup is typically hard to deal with so merging directly into the workspace should only be done when necessary.
The actions in the merge editor complement the manual merge toolbar actions that are available in the bottom half of the merge editor.
|Merge||Running this action will bring the changes into the file in the workspace. Any conflicts that are not auto-mergeable will be skipped.|
|Override and Update||This action is enabled on files with conflicting changes. Running this action will discard any local changes you have and replace the file with the remote contents.|
|Mark as Merged||This action will remove the selected changes from the view. The changes will only reappear if the remote state of the resource changes and the CVS Merge Synchronization is refreshed.|
Tip: You can perform ongoing merges by pinning a CVS Merge Synchronization in the Synchronize view. This will allow you to keep your workspace up-to-date with the changes released to a different branch.
Team programming with CVS
Synchronizing with a CVS repository
Synchronizing with the repository
CVS Merge Synchronization