Sync and conflicts

Every record carries a revision. When you push a change, include the revision you based it on.

If the server has a newer revision, the change is not applied and the record is returned in conflicts with both versions. Clients merge locally and push again. For note bodies we recommend a three-way merge using the version history.

Copy{
  "applied": 12,
  "conflicts": [
    {
      "id": "nt_8f3k2Q9xLm",
      "server_revision": 15,
      "client_revision": 14
    }
  ],
  "cursor": "c_0000019c8e30"
}