search

avram / zandy

Zotero on Android
http://www.gimranov.com/avram/w/zandy-user-guide
GNU Affero General Public License v3.0
145 stars 28 forks source link

Conflict resolution #18

Open avram opened 12 years ago

avram commented 12 years ago

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 commented 12 years ago

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

avram commented 12 years ago

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.