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

Reconcile ambiguous merge outcomes after upstream timeouts #278

Merged
timmy merged 1 commits from timmy/277-reconcile-merge-timeouts into main 2026-08-08 07:34:43 +00:00
Conversation 0 Commits 1 Files Changed 5 +168 -3
timmy commented 2026-08-08 07:33:55 +00:00
Owner
Copy Link

Closes #277

What changed

  • reconcile failed or timed-out merge responses against authoritative Gitea pull state and expected head SHA
  • return confirmed success for an accepted merge, or a truthful confirmation_pending response when state cannot be proven
  • preserve the pending-confirmation guidance in the mobile pull sheet

Tests

  • RED observed for accepted-before-timeout reconciliation
  • RED observed for authoritative merge-state lookup
  • RED observed for unresolved confirmation response
  • RED observed for mobile pending guidance
  • pytest -q — 489 passed
Closes #277 ## What changed - reconcile failed or timed-out merge responses against authoritative Gitea pull state and expected head SHA - return confirmed success for an accepted merge, or a truthful `confirmation_pending` response when state cannot be proven - preserve the pending-confirmation guidance in the mobile pull sheet ## Tests - RED observed for accepted-before-timeout reconciliation - RED observed for authoritative merge-state lookup - RED observed for unresolved confirmation response - RED observed for mobile pending guidance - `pytest -q` — 489 passed
timmy added 1 commit 2026-08-08 07:33:56 +00:00
fix: reconcile ambiguous merge outcomes (#277)
All checks were successful
CI / lint (pull_request) Successful in 26s
Details
CI / build-frontend (pull_request) Successful in 5s
Details
e58808f2d4
timmy merged commit b11ec6a732 into main 2026-08-08 07:34:43 +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#278
No description provided.
Delete Branch "timmy/277-reconcile-merge-timeouts"

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?