Code

Push sync conflict resolving#1738

Code

Open

primus11 wants to merge 6 commits intoNozbe:masterNozbe/WatermelonDB:masterfrom Pantiko:push_sync_conflict_resolvingPantiko/WatermelonDB:push_sync_conflict_resolvingCopy head branch name to clipboard

+350-38

Commits

Commits on Jan 16, 2024

• Supported experimentalAcceptedIds as safer alternative to rejectedIds

  Show description for 361a1bc
  primus11

  committed
  361a1bc

• rebased, fixed, added tests

  primus11

  committed
  3599f99

Commits on Jan 19, 2024

• lint&flow

  Show description for ddf945b
  primus11

  committed
  ddf945b

• Added SyncRejectedIds to allow time for migration

  primus11

  committed
  335c0cc

• removed SyncShouldUpdateRecord after merge

  primus11

  committed
  204022a

• Added option to do push sync conflict resolution

  Show description for 84a5f6b
  primus11

  committed
  84a5f6b