huskies: merge 892

2026-05-12 16:46:37 +00:00
parent c3144b7937
commit b76633b79b
4 changed files with 86 additions and 1 deletions
@@ -133,6 +133,7 @@ pub fn move_story_to_done(story_id: &str) -> Result<(), String> {
        Stage::Merge { .. } => PipelineEvent::MergeSucceeded {
            merge_commit: GitSha("accepted".to_string()),
        },
+        Stage::MergeFailure { .. } => PipelineEvent::Accepted,
        Stage::Coding | Stage::Qa | Stage::Backlog => PipelineEvent::Close,
        _ => {
            return Err(format!(