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

Resolve offline Tomorrow plan conflicts on mobile #1165

Merged
rockachopa merged 2 commits from timmy/1164-tomorrow-conflict-recovery into main 2026-08-20 04:12:34 +00:00
Conversation 0 Commits 2 Files Changed 6 +396 -6
timmy commented 2026-08-20 03:49:45 +00:00
Owner
Copy Link

Closes #1164

Adds an explicit mobile review for cross-device Tomorrow conflicts. Operators can compare phone/account plans, keep the phone plan via a conflict-safe rebase, or adopt server truth without a write. Includes controller tests and packaged Chromium journeys at 320×568 and 390×844.

Closes #1164 Adds an explicit mobile review for cross-device Tomorrow conflicts. Operators can compare phone/account plans, keep the phone plan via a conflict-safe rebase, or adopt server truth without a write. Includes controller tests and packaged Chromium journeys at 320×568 and 390×844.
timmy added 1 commit 2026-08-20 03:49:46 +00:00
feat: resolve mobile Tomorrow plan conflicts (Closes #1164)
Some checks failed
CI / lint (pull_request) Successful in 3m26s
Details
CI / build-release (pull_request) Successful in 7s
Details
CI / browser-journey (pull_request) Failing after 3m49s
Details
CI / release-candidate (pull_request) Has been skipped
Details
16a6ee1136
rockachopa added 1 commit 2026-08-20 04:04:22 +00:00
fix: bind Tomorrow conflict recovery to operator account
All checks were successful
CI / lint (pull_request) Successful in 3m36s
Details
CI / build-release (pull_request) Successful in 8s
Details
CI / browser-journey (pull_request) Successful in 3m50s
Details
CI / release-candidate (pull_request) Has been skipped
Details
059722de6c
rockachopa merged commit 99b60e5f5f into main 2026-08-20 04:12:34 +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
2 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#1165
No description provided.
Delete Branch "timmy/1164-tomorrow-conflict-recovery"

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?