Preserve concurrent inspection findings as explicit conflicts
Two inspectors change a safety finding from different base revisions and last-write-wins hides one observation.
- Focused work estimate
- 4h + prerequisites
- Priority in the scenario
- Medium
- Engineering practice
- Conflict detection · Causal revisions
Estimated field mix
- Distributed systems70%
- Backend30%
Field percentages are editorial estimates of the ticket's engineering focus. They total 100%; they are not measured time, proficiency scores, or ownership evidence.
Review it, then add it to your workspace.
The board opens an editable draft; nothing is saved until you confirm it. Sign-in and workspace permissions apply, and Demo boards remain ephemeral.
Project context
A fictional field team inspects equipment with intermittent connectivity. Two tablets can edit the same checklist and an old upload may restore a deleted finding.
Setup prerequisites
- Create two local client-state simulators and a synthetic inspection API.
- Use fabricated notes and local attachment bytes.
Preceding work
Complete these dependencies, or supply their agreed outputs before taking this ticket.
- AMERGE-101 · Define offline change envelopes with stable client operation IDs
- AMERGE-102 · Require current inspection access before applying a queued offline change
- AMERGE-103 · Distinguish independent checklist edits from conflicting edits
- AMERGE-104 · Apply offline operations with a durable deduplication record
Acceptance criteria
- Detect divergence from the declared base revision.
- Persist both proposals and their operation identities.
- Block authoritative resolution until a permitted resolution command chooses or combines them.
Implementation constraints
- Do not infer which observer is correct from arrival time.
Verification to include
- Submit conflicting changes in both arrival orders and retain equivalent conflict facts.
- Attempt ordinary edit completion over an unresolved conflict and reject it.
Deliverables
- Conflict record model and order-invariance tests
Rollout and recovery
Enable conflict capture before automatic reconciliation; leave existing ambiguous cases unresolved.
Value of the work
For the engineer: Practice offline synchronization, causal revisions and conflict resolution.
For the team: Review whether field work survives disconnection without hiding conflicting observations.
Evidence boundaries
Outcome Evidence: Tests, patches, and runbooks are requested deliverables. They become Outcome Evidence only through a qualified Mission and immutable Evidence IDs.
Ownership Evidence: Independent adaptation must be observed under a declared verification policy and cite immutable Evidence IDs. Completing a planning ticket establishes no Ownership Evidence.