JetBrains Rider
 
Get JetBrains Rider
Get your hands on the new features ahead of the release by joining the Early Access Program for Rider 2025.1! Learn more

Resolve property conflicts

Last modified: 26 May 2024

A property conflict is reported during synchronization with the server when JetBrains Rider detects differences between the properties of a local file or folder and their server version. JetBrains Rider 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 Repository tool window Alt09. You have to resolve property conflicts manually and then tell JetBrains Rider to treat the corresponding files and folders as conflict-free.