Preserve both versions when synchronized Drafts diverge #854

2026-08-14T22:30:06Z

timmy commented

2026-08-14 22:30:06 +00:00

Closes #853

What changed

remember compact per-Draft synchronization fingerprints
three-way merge local and remote Draft state
preserve divergent edits as a labeled conflict copy instead of overwriting either version
atomically reconcile remote text and screenshot evidence back into local Draft storage
surface an explicit “both versions were saved” status

Verification

RED: stale same-ID phone edit overwrote the newer desktop edit
GREEN: focused sync/reconciliation tests pass
Full suite: 1622 passed in 93.95s

Closes #853 ## What changed - remember compact per-Draft synchronization fingerprints - three-way merge local and remote Draft state - preserve divergent edits as a labeled conflict copy instead of overwriting either version - atomically reconcile remote text and screenshot evidence back into local Draft storage - surface an explicit “both versions were saved” status ## Verification - RED: stale same-ID phone edit overwrote the newer desktop edit - GREEN: focused sync/reconciliation tests pass - Full suite: `1622 passed in 93.95s`

timmy added 1 commit 2026-08-14 22:30:07 +00:00

fix: preserve divergent synchronized Drafts (Closes #853 )

CI / lint (pull_request) Successful in 1m53s

Details

CI / build-release (pull_request) Successful in 6s

Details

CI / release-candidate (pull_request) Has been skipped

Details

cee3d93864

timmy merged commit fc35b17d24 into main

2026-08-14 22:36:00 +00:00

timmy referenced this issue from a commit

2026-08-14 22:36:01 +00:00

Merge pull request 'Preserve both versions when synchronized Drafts diverge' (#854) from timmy/853-divergent-unfiled-drafts into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: stackchain/stackchain-dashboard#854