Resolve property conflicts

Open the Version Control tool window Alt09 and switch to the Repository tab.

In the Changed Files pane, select the conflicting file.

Choose Properties Diff from the context menu of the selection, or click on the toolbar.

Explore the differences in the Subversion properties difference viewer:

Update the properties so the conflict is resolved.

In the Update Info tab of the Version Control tool window Alt09, select the fixed file under the Merged with property conflicts node. As you can see, the file is still displayed in red as conflicting.

From the context menu of the selection, choose Subversion, and then choose Mark Resolved.

When the dialog is closed, the Changes view shows the affected files as updated and available for checking in to the server.

Check in the resolved files.