|Branches and Tags / Merging|
The Merge Wizard - The Merge Type
The Merge Wizard - Merge Two Different Trees
If you are using this method to merge a feature branch back to trunk, you need to start the merge wizard from within a working copy of trunk. In the From field enter the full folder URL of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. In the To field enter the full folder URL of the feature branch.
By default the start URL will be the URL of the selected file in the working copy. If you want to specify a different URL you should browse the repository and select a start URL and a revision.
In the Revision field enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits.
By default the HEAD revision is selected. If you want a previous revision you have to select the Other revision option and press the History button to see a list of all revisions.
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: