file stops syncing after conflict, no error logged about standardnotes-fs HOT 5 CLOSED

I don't think I added any logic for handling sync conflicts. I almost never have them with the official clients because they save and sync so frequently.

@mobitar, any tips on detecting sync conflicts?

from standardnotes-fs.

Conflicts are returned by the server in an array called unsaved_items. This is the server letting the client know that the items the client sent to be saved were rejected, because saving them would have resulted in overwriting data. So if the client doesn't handle these unsaved_items, then you'd perpetually have unsycned changes.

from standardnotes-fs.

I don't see an unsaved_items array, but rather a conflicts array:

    "conflicts": [
        {
            "server_item": {
                "uuid": "4c0bcd94-8c27-11eb-8699-854761ae33c6",
                "duplicate_of": null,
                "items_key_id": "417b0d02-c431-4f65-ac6f-5927d77e69cf",
                "content": "003:06870....5Aw==",
                "content_type": "Note",
                "enc_item_key": "003:d4260....+Fc9L",
                "auth_hash": null,
                "created_at": "2021-03-23T22:29:57.238Z",
                "updated_at": "2021-03-23T22:32:34.871Z",
                "deleted": false
            },
            "type": "sync_conflict"
        }
    ],

The server seems to keep sending it over and over. What's the correct way to handle a conflict and mark it resolved? Is this documented anywhere? Thanks!

from standardnotes-fs.

conflicts is part of an older API version. You should be passing 20200115 as the version param to sync requests.

To handle conflicts you'd need to take the items in the unsaved_items array and create new items out of them (with new UUIDs). That would resolve the conflict essentially.

In SN clients it's a little more intricate since we try not to create conflicts as much as possible, but if you want to take the safest minimal route it would be just to create a new note with a new uuid.

from standardnotes-fs.

Okay @ogourment this should be fixed in a5ae5df. Can you please update, backup, and test conflicts thoroughly in both directions?

Thanks.

from standardnotes-fs.