huskies: merge 982

2026-05-13 15:30:03 +00:00
parent e6d051d016
commit 91fbad568a
15 changed files with 357 additions and 117 deletions
@@ -338,7 +338,7 @@ mod stage_migration_tests {
                "9507_legacy_merge_failure",
                "4_merge_failure",
                Stage::MergeFailure {
-                    reason: String::new(),
+                    kind: crate::pipeline_state::MergeFailureKind::Other(String::new()),
                    feature_branch: crate::pipeline_state::BranchName(String::new()),
                    commits_ahead: NonZeroU32::new(1).unwrap(),
                },