"Conflicted copy" when local file is more recent

[bitkris-dev]

Setup info
Hi, following the issue #289 , I'm still having the same problem currently.
Server version 3.5.0, desktop client version 2.0.0.838 (flb954).

---

What happened
I'm a musician and I work often with Photoshop for artwork graphics and Reaper for producing/exporting music, and I'm getting this issue with 2 workflows which involve those softwares.

When I save a big .PSD file, it sometimes (not always) clones it as a renamed "conflicted copy", despite the local file being created with a more recent date than the remote file with the same name.
The same happens when I export .mp3 or .wav files from Reaper to a local folder, the server has an older version with the same name but yet, I get a "conflicted copy" renamed file.

I find this frustrating because the correct file gets renamed and it's a pain in the *** to always manually rename it back with no suffix.

---

Workaround
As a workaround, I try to remember to pause the synchronization, do what I have to do, and then restart it. This solves the issue, but it's a frustrating solution as well.

---

My conclusions
The culprit may be the case when creating a file requires a timespan longer than the update frequency which OpenCloud uses to detect and sync with the server.

---

Possible fixes

1. Implement a Select in the settings, something like "Conflict strategy" with options "Create a conflicted copy file (default)", "Force local to server", "Force server to local"
2. or record any conflicted file into the client UI and let the user choose how to fix the conflict with a one-click solution (with the same options as above)

let me know if you need any other info by my side!

[TheOneRing]

We identified an issue where the server announced recently uploaded files as "new" opencloud-eu/reva#380
As our logic is that the server is always right, that means that the just uploaded files will directly get downloaded and conflict with your local state.
We are working on a solution.