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

Resolve property conflicts

Last modified: 23 August 2023

A property conflict is reported during synchronization with the server when PyCharm detects differences between the properties of a local file or folder and their server version. PyCharm 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 PyCharm to treat the corresponding files and folders as conflict-free.