Go Up to Projects Window
View > Project Manager | right-click a project under SVN | Subversion > Merge
Projects Window | right-click a project under SVN | Subversion > Merge
Merge starts merging the changes of a range of revisions you select, as follows:
- From Repository Root starts the merge operation at the top level of the repository.
- From Project Directory starts the merge operation at the project directory.
To start merging the changes of revisions in your local repository copy:
- Start the merging dialog box: Projects Window | right-click a project under SVN | Subversion > Merge
- Select Merge Type (how the files are merged) between the following options:
Merge a range of revisions
To port changes to a different branch, in case you have done one or more revisions to a branch (or to the trunk).
Reintegrate a branch
To replicate your branch changes back into the trunk.
Merge two different trees
To merge the differences of two branches into the working copy.
- Fill the following fields according to your remote repository settings:
URL to merge from
Insert the full URL of the remote repository containing the changes from where the merge starts.
Click next to the URL of the repository to open the Repository Browser dialog box and show all remote repository revisions.
Revision range to merge
Insert the list of revisions you want to merge. This can be a single revision, a range of revisions to merge (separated by commas or a dash).
Click the Show Log button to open the Repository Browser dialog.
Shows the full path of the local repository copy folder. Click the Show Log button to open the local repository log.
- Select the merge options (advanced options):
- Merge depth. You can specify how far down into your working copy the merge should go. You can merge the entire tree, a specified directory (including child folders or not) or the working copy.
- Ignore ancestry. You can merge two trees by using only path-based differences (instead of history merge differences).
- Ignore line endings. You can select whether to ignore line endings when comparing two files or not.
- Whitespace comparing. You can select whether to compare whitespaces when comparing two files or not:
- Compare whitespaces
- Ignore whitespace changes
- Ignore all whitespaces
- Force the merge. You can avoid a tree conflict if an incoming file affects a modified file in your working copy.
- Only record the merge. You can mark your revision as merged if you are using a merge tracking.