huskies: merge 868

2026-04-29 23:28:57 +00:00
parent e02e566648
commit 1d86202abb
15 changed files with 135 additions and 60 deletions
@@ -149,6 +149,7 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
            Stage::Blocked { .. } => state.current.push(story), // blocked shown with current
            Stage::Qa => state.qa.push(story),
            Stage::Merge { .. } => state.merge.push(story),
+            Stage::MergeFailure { .. } => state.merge.push(story), // show merge failures with merge
            Stage::Done { .. } => state.done.push(story),
            Stage::Archived { .. } => {} // skip archived
            Stage::Frozen { .. } => state.backlog.push(story), // show frozen with backlog