huskies: merge 919

2026-05-13 06:22:22 +00:00
parent 9ce5a8df0c
commit 09a8edc0a1
7 changed files with 146 additions and 48 deletions
@@ -432,6 +432,8 @@ fn project_stage_for_view(
        }),
        "merge_failure" => Some(Stage::MergeFailure {
            reason: String::new(),
+            feature_branch: BranchName(format!("feature/story-{story_id}")),
+            commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
        }),
        "merge_failure_final" => Some(Stage::MergeFailureFinal {
            reason: String::new(),