Resolving Merge Conflicts in Subversion

See Also

When merge conflicts occur, a Merge Conflict badge (Merge Conflict Badge) appears on the parent folder (or package) of file. Within the file itself, each conflict is marked with arrows followed by the lines from the two revisions that caused the conflict.

To resolve merge conflicts graphically with the Merge Conflicts Resolver:

  1. In the Projects, Files, Favorites, or Versioning window, select the file whose status indicates that there is a conflict and choose Resolve Conflicts from the menu. The Merge Conflicts Resolver displays with merge conflicts highlighted in red.
  2. Use the Next (Next) and Previous (Previous) difference buttons in the upper-left corner to navigate to each conflict in the file.
  3. For each conflict, click Accept above the pane containing the text that you wish to accept. Once you have chosen the correct text, it is highlighted in green and displayed in the Merge Result pane. The text you did not choose is highlighted in blue.
  4. If neither pane contains the text you want, exit the Merge Conflict Resolver and edit your source file manually. When you are done making changes, right-click the file and choose Resolve Conflicts (or Subversion > Resolve Conflicts) from the contextual menu. Then repeat the procedure, beginning with Step 1.
  5. After resolving each conflict, click OK to exit the Merge Conflict Resolver. The IDE updates your local working copy with the desired changes.
See Also
Comparing File Revisions in Subversion
Merging File Revisions in Subversion

Legal Notices