Merge

Use the Merge command to merge changes from other source-branches to the selected file/directory.

Select Trunk to merge from the main trunk. Select Branch or Tag and enter the branch or tag name to merge changes from a branch or tag. Location shows the final merge source.

You can either merge a Revision Range, where all revisions From a certain revision To another revision are merged. For the To Revision, you can either specify the Revision directly or merge up to HEAD. The merged changes correspond exactly to the difference between both revisions. You can also merge changes from exactly one Single Revision, which is specified by its Number.

Select Reverse merge to reverse the changes between the selected revisions. Internally, this is achieved by swapping the start and end revision.

By default, merging takes the ancestry into account. This means, that Merge does not simply calculate (and merge) the difference between two files which have the same path, but also checks if both files are actually related. For the typical usecases of Merge, this behaviour leads to the expected results. For all other cases, you can decide to switch it off by selecting Ignore ancestry.

Select Recurse into subdirectories to merge not only the files in the currently selected directory, but also those from subdirectories.

This Merge command only works on directories, which are covered by the Repository Layout (see Repository Layout), defined in the Project Settings. To merge from arbitrary locations use the Merge from URL command.