nextcloud / desktop

💻 Desktop sync client for Nextcloud
https://nextcloud.com/install/#install-clients
GNU General Public License v2.0
2.89k stars 771 forks source link

Improve conflict handling in macOS Virtual Files module Sync Engine #6835

Open claucambra opened 3 days ago

claucambra commented 3 days ago

How to use GitHub

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)