Resolving Merge Conflicts in Subversion
See Also
When merge conflicts occur, a 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.
- Merge conflicts must be resolved prior to checking your local file into the
repository.
To resolve merge conflicts graphically with the Merge Conflicts Resolver:
- 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.
- Use the Next (
) and Previous
(
) difference buttons in the upper-left
corner to navigate to each conflict in the file.
- 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.
- 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.
- After resolving each conflict, click OK to exit the Merge Conflict Resolver. The IDE
updates your local working copy with the desired changes.
- Once you have resolved each merge conflict, you still need to commit
the file to add your changes to the repository copy.
- See Also
- Comparing File Revisions in Subversion
- Merging File Revisions in Subversion
Legal Notices