huskies: merge 982

2026-05-13 15:34:41 +00:00
parent e6d051d016
commit 91fbad568a
15 changed files with 357 additions and 117 deletions
@@ -901,7 +901,9 @@ fn merge_failure_item_appears_in_merge_section_not_blocked() {
        "100_story_merge_fail",
        "Merge Failure Story",
        Stage::MergeFailure {
-            reason: "conflict in lib.rs".to_string(),
+            kind: crate::pipeline_state::MergeFailureKind::ConflictDetected(Some(
+                "conflict in lib.rs".to_string(),
+            )),
            feature_branch: BranchName("feature/100".to_string()),
            commits_ahead: std::num::NonZeroU32::new(1).unwrap(),
        },