huskies: merge 892

2026-05-12 16:51:23 +00:00
parent c3144b7937
commit b76633b79b
4 changed files with 86 additions and 1 deletions
@@ -164,6 +164,14 @@ pub fn transition(state: Stage, event: PipelineEvent) -> Result<Stage, Transitio
            reason: ArchiveReason::Completed,
        }),

+        // ── MergeFailure → Done (manual recovery) ───────────────────────
+        // Allows a human operator to accept a story whose merge permanently
+        // failed, marking it Done without going through the normal merge path.
+        (MergeFailure { .. }, Accepted) => Ok(Done {
+            merged_at: now,
+            merge_commit: GitSha("manual".to_string()),
+        }),
+
        // ── Block: any active → Blocked ──────────────────────────────
        (Backlog, Block { reason })
        | (Coding, Block { reason })