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, Favorites, or Subversion 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:
   • Merge From. Select one of the following types of merge:
     • One Repository Folder. Port changes from one repository folder.
     • Two Repository Folders. Port changes from two repository folders.
     • One Repository Folder Since Its Origin. Port changes that have occurred between the time of the folder's creation and the revision number that you specify in the Ending Revision Field.
   • Repository Folder. The folder from which you want to port changes. (If you select Two Repository Folders in the Merge From field, this field is replaced by First Repository Folder and Second Repository Folder fields.)
   • Starting Revision. If merging from a single revision, enter the revision number. If merging changes that occurred within a range of revisions, enter the starting point of that range.
   • Ending Revision. If merging changes that occurred within a range of revisions, enter the ending point of that range.
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.

• After merging file changes to your local working directory, you must still commit the changes using the Commit command in order for them to added to the repository.

For more information about merging files with Subversion consult your Subversion documentation.

See Also

Resolving Merge Conflicts in Subversion

Comparing File Revisions in Subversion