zandy
zandy copied to clipboard
Conflict resolution
At present, a sync of the whole library or of the affected collection will resolve the conflict silently in favor of the server's version.
As of 6f950750a3fa7d9eef011544a744517eb66bcdc7, the apirequests
table can let us know which requests are failing, including those failing due to conflicts.
So the conflict resolution will be a general system for resolving things that can't go through-- conflict resolution itself may need its own dialog; the user should be able to just re-run or delete other entries with a simple dialog.