Improve conflict handling in macOS Virtual Files module Sync Engine

[claucambra]

How to use GitHub

• Please use the 👍 reaction to show that you want to have the same feature implemented.
• Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
• Subscribe to receive notifications on status change and new comments.

Feature description

The macOS VFS sync engine will currently handle conflicts in very naive ways. For example, incoming file-name clashes will lead to the new file being ignored. Similarly, with files that have changed both locally and on the server, the file provider sync engine will always choose to push the local changes

We should more gracefully detect these conflicts and allow the user to resolve the issue by creating actionable conflict files (and maybe a conflict dialog)

[coder-hugo]

To me it feels like the conflict handling isn't working at all at the moment. If I overwrite a file locally the changes are never synced to the server. The only way I've found to sync the changes is the following:

1. delete the relevant file on the server
2. recreate the file locally

Is there any way to enforce the sync of a file that has changed locally?