zandy icon indicating copy to clipboard operation
zandy copied to clipboard

Conflict resolution

Open avram opened this issue 13 years ago • 3 comments

avram avatar Sep 20 '11 04:09 avram

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.

avram avatar Nov 28 '11 02:11 avram

As of 6f950750a3fa7d9eef011544a744517eb66bcdc7, the apirequests table can let us know which requests are failing, including those failing due to conflicts.

avram avatar Jan 15 '12 06:01 avram

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.

avram avatar Jan 15 '12 11:01 avram