"Conflict detected" is shown on every save

[Anže Kovač]

Everytime when file is saved "Conflicts detected" window is shown. Retrieve for merge shows no difference (panel shows "Nothing to show") since most of the time there is no difference.

Is there an option to only show this window when there are some differences in the saved file?

Check for conflicts is checked and login type is "Shared Login" on project configuration.

[Scott Wells]

Anze, the mechanisms that drive conflict detection are documented here:

http://www.illuminatedcloud.com/home/deployment

Right now it doesn't perform any type of physical diff of the server vs. local file because it would be required to download the file(s) first and that can be quite expensive to check deployments of any size by retrieving first.

If you're using the shared login strategy then it's checking whether the server copy has been modified since the last time the local copy was last successfully deployed or retrieved via IC. Do you know why it would be reaching that conclusion?

If you'd like details on exactly how it's deciding that there's a conflict you can enable debug logging for metadata deployment as documented here:

http://www.illuminatedcloud.com/support/debuglogging

and you should get detailed information in ideal.log (Help>Show Log in Explorer/Finder/Files).

[Scott Wells]

Issue tracker grooming. If this is still an issue, please feel free to reopen, ideally with a concrete reproduction scenario.