CVS: Merge Changes from Branch Dialog Box
See Also
The Merge Changes from Branch dialog box enables you to merge files from a
branch or the trunk to your local working directory.
You access this dialog box by right-clicking a versioned file or folder
(e.g. in the Projects, Files, or Favorites window) and choosing CVS > Merge Changes from
Branch.
Current Working Branch is your local working directory. This field
contains Trunk if you are working in the trunk, or the name of a branch.
When merging files, select one of the following:
- Merge from Trunk. Select this to merge changes that were made
in the trunk to your working directory.
- Merge from Branch. Select this to merge changes that were made
in the specified branch to your working directory. When you choose this option,
specify the name of the branch you want to merge into your local repository.
You can enter the name of the branch in the text field or click Browse to open
the Browse Tags dialog box and choose from the available branches.
You can set the following options when merging files to your local repository:
- Merge Only Changes Made after Tag. When selected, only changes
made after the specified tag are merged into your local repository. Enter the
name of the tag in the text field or click Browse to open the Browse Tags dialog
box and choose from the available tags. If unselected, all changes are merged into
your local repository.
- Tag Trunk After Merge. When selected, the trunk is tagged after
merging to mark changes you have already merged. Enter the tag to attach after
the merge, or click Browse to choose an existing tag. If unselected, no tag is
attached to the source branch.
- See Also
- Merging File Revisions from a Branch
Legal Notices