IntelliJ IDEA
 
Get IntelliJ IDEA
You are viewing the documentation for an earlier version of IntelliJ IDEA.

Resolve conflicts in Subversion

Last modified: 02 August 2022

If a conflict occurs in a file under the Subversion version control, conflict markers are added to the conflicting file, and three auxiliary unversioned files are created in your local working copy:

  • filename.mine: the copy of your local file without conflict markers.

  • filename.rOld: the base revision you have last synchronized to.

  • filename.rNew: the latest version on the server.

Conflicting files are marked with red in the Local Changes view . In the Update Info tab, they are grouped in the Merged with conflicts list and are also marked with red.

You can resolve conflicts in two ways:

  • Semi-automatically, using a merge tool.

  • Manually in the editor. After that, you need to manually mark the processed files as conflicts-free.