Skip to content

Commit e245323

Browse files
Changelog: add link to conflict resolution docs.
1 parent da5a585 commit e245323

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

objectbox/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
### Sync
3131

3232
* Sync protocol version 10
33-
* Conflict resolution via the new annotations `@SyncClock()` and `@SyncPrecedence()` (allows last
34-
win with custom conflict resolution)
33+
* [Conflict resolution](https://sync.objectbox.io/syncing-concurrent-changes) via the new
34+
annotations `@SyncClock()` and `@SyncPrecedence()` (allows last win with custom conflict resolution)
3535
* SyncClient: support updating filter variables. After login, stage updates using put and remove,
3636
then schedule to send them to the server with `applyFilterVariables()`.
3737
* Clients report errors to the server

0 commit comments

Comments
 (0)