Merging File Revisions in Subversion

See Also

The Merge command is useful for porting changes from a specific repository revision to your local working copy of a file or folder. You can also port the changes made within a given range of revisions to your local working copy.

To port changes from a revision or range of revisions to your local working copy:

  1. In the Projects, Files, or Favorites window, right-click the files or folders on which you want to perform the merge operation and choose Subversion > Merge Changes.
  2. In the dialog that appears, fill in the following fields:
  3. Click 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
Comparing File Revisions in Subversion
Resolving Merge Conflicts in Subversion

Legal Notices