[joker-777]

Records columns set while creating a record in its _changed field, so a conflict with a pulled record of the same id is resolved per column. Related issue: #1533.

Changes

• Columns set in a collection.create() builder are now recorded in _changed for records with _status: 'created'. Before, _changed stayed empty until the first update
• When a pull contains a record with the same id as a locally created, not yet pushed one, the conflict is now resolved per column: locally set columns win and the rest comes from the server. Before, the remote version won entirely
• A custom conflictResolver gets this per-column result as resolved, and local._changed lists the columns set locally
• Pushed created records now carry a non-empty _changed. The backend docs already say servers must ignore it. markLocalChangesAsSynced still resets it to ''
• Not tracked: records created with a _status other than created (for example synced records built in a create builder), and _prepareCreateFromDirtyRaw, which sync uses

Tests

• New test in synchronize.test.js: creates a task offline, pulls the same id with different values, and checks the push payload and the final synced record. It fails on master, where _changed is ""
• Model tests updated for the new _changed values, plus tests for values equal to the default and for synced creates

Verification

• On this branch: Jest passes on the host, 79 suites (the sqlite-node suite was left out because better-sqlite3 does not build on the host's Node; this change does not touch the adapters). flow check is clean, and ESLint is clean on the changed files
• The four sync PRs from us ([Sync] Apply batched pulls sequentially and notify observers once per pull #1984, [Sync] Validate the whole pulled changeset before applying any of it #1985, [Sync] Track changed columns on locally created records #1986, [Sync] Make sync bookkeeping linear-time #1987) touch applyRemote.js and its tests in separate places. They merge into master together without conflicts, and Jest passes on the result

🤖 Generated with Claude Code

[StasDoskalenko]

Hi @joker-777, thank you for this!

I maintain NitromelonDB, a maintained fork of WatermelonDB (New Architecture, Nitro Modules). _changed is still left empty on create there too, so the same conflict happens.

Our fork was rewritten in TypeScript (strict mode) to reduce the chance of bugs like this one slipping through, so I think the community would really benefit if you opened your PRs against it too. The relevant code is in src/Model/index.ts.

If you don't have the time or would rather not, no worries at all, I'm happy to port it myself. Just let me know. Thanks a lot!