IntelliJ IDEA
 
Get IntelliJ IDEA

Resolve property conflicts

Last modified: 26 May 2024

A property conflict is reported during synchronization with the server when IntelliJ IDEA detects differences between the properties of a local file or folder and their server version. IntelliJ IDEA does not attempt to resolve property conflicts automatically, and displays the conflicting files and folders under the Merged with property conflicts node in the Update Info tab of the Version Control tool window Alt09. You have to resolve property conflicts manually and then tell IntelliJ IDEA to treat the corresponding files and folders as conflict-free.