stackchain/stackchain-dashboard
1
0
Fork 0
Code Issues 9 Pull Requests 1 Actions Packages Projects Releases 713 Wiki Activity

Preserve both versions when synchronized Drafts diverge #854

Merged
timmy merged 1 commits from timmy/853-divergent-unfiled-drafts into main 2026-08-14 22:36:00 +00:00
Conversation 0 Commits 1 Files Changed 4 +260 -20
timmy commented 2026-08-14 22:30:06 +00:00
Owner
Copy Link

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)
All checks were successful
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
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
P0

Drop everything

  
P1

High priority

  
P2

Medium priority

  
agent:nightprowl

Assignments routed to the LongCat NightProwl evaluation worker

  
backend

Backend service

  
ci

Continuous integration / actions

  
frontend

Frontend / UI

  
meta

Meta / planning

  
pages

Gitea Pages

  
template

Repo template / standards

No Label
P0
P1
P2
agent:nightprowl
backend
ci
frontend
meta
pages
template
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: stackchain/stackchain-dashboard#854
No description provided.
Delete Branch "timmy/853-divergent-unfiled-drafts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?