Reconcile ambiguous merge outcomes after upstream timeouts #278

2026-08-08T07:33:55Z

timmy commented

2026-08-08 07:33:55 +00:00

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 )

CI / build-frontend (pull_request) Successful in 5s

Details

CI / lint (pull_request) Successful in 26s

Details

e58808f2d4

timmy merged commit b11ec6a732 into main

2026-08-08 07:34:43 +00:00

timmy referenced this issue from a commit

2026-08-08 07:34:44 +00:00

Merge pull request 'Reconcile ambiguous merge outcomes after upstream timeouts' (#278) from timmy/277-reconcile-merge-timeouts 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#278