The Merge Wizard - The Merge Type
The Merge Wizard - Revisions Range
In the Revision range to merge section you can choose to merge all revisions or enter the list of revisions you want to merge in the Revision range field. This can be a single revision, a list of comma separated specific revisions, or a range of revisions separated by a dash, or any combination of these.
The History button opens the the History dialog which allows selecting the list of revisions to be merged in the easiest way. One or several revisions can be selected in that dialog.
Be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update.
If you want to merge changes back out of your working copy, to revert a change which has already been committed, select the revisions to revert and check the Reverse merge box.
By default the root folder of the current working copy from the Working Copy view is set in this field.
If you have already merged some changes from this branch and you remember the last merged revision, you can select that revision for the working copy using the History button. For example, if you have merged revisions 27 to 33 last time, then the start point for this merge operation should be revision 33.
By default the URL of the repository of the current working copy from the Working Copy view is set in this field.
Apache SubversionTM has merge tracking features and automatically records the last merged revision so you do not need to remember when you performed the last merge.
The Merge Wizard - Advanced Options
You can specify how far down into your working copy the merge should go by selecting one of the following values:
The depth term is described in the Sparse checkouts section. The default depth is the depth of the current working copy.
After the merge operation is finished it is possible to have some resources in conflict. This means that some incoming modifications for a resource could not be merged with the current modifications from the working copy. If there are such conflicts, the following dialog will appear presenting you the resources that are in conflict. In this dialog you can choose a way in which every conflict should be resolved.
Merge Conflicts Dialog
The options to resolve a conflict are: