Home/Blocks/Conflict dialog

Conflict dialog

The dialog that opens when the offline runtime detects a record changed on the server while we held an edit locally.

Stable .conflict-dialog Side-by-side diffOffline runtime

Default

● Sync conflict

Inventory adjustment SKU-0833

The server has a newer version. Pick which to keep.

Your version (local)
On-hand12
ReasonStock take
Last editToday 14:12
Server version
On-hand14
ReasonStock take
Last editToday 14:18
Conflict resolution

Do & don't

Do

Show both versions side by side. The operator decides; don’t auto-merge.

Don't

Show fields that didn’t change. Only the differences need attention.

Do

Time-stamp both versions so the operator can judge recency.

Don't

Allow "Skip for now". A conflict held in limbo will be worse later.