Subversion: Merge Dialog Box

See Also

The Subversion Merge dialog box enables you to incorporate changes from a specific repository revision into your local working copy of a file or folder. You can also specify changes from a given range of revisions from the repository.

The Merge dialog box can be accessed by right-clicking a versioned file or folder (e.g. in the Projects, Files or Favorites window) and choosing Subversion > Merge Changes.

In the Merge Changes dialog box, you must specify the following fields:

Based on your selection above, the dialog dynamically updates to reflect the required fields. For example, if you chose to merge from two repository folders, combo boxes for the first and second repository folders display, and the preview is modified accordingly. Likewise, if you chose to merge from one repository folder since its origin, you need only specify the location of the repository folder in the Repository Folder combo box.

Click Merge to initiate the merge. The IDE incorporates any differences found in the selected revision to the local copy of the file. If merge conflicts occur, the file's status is updated to Merge Conflict to indicate this.

See Also
Merging File Revisions in Subversion
Resolving Merge Conflicts in Subversion

Legal Notices