huskies: merge 919

server/src/crdt_state/read.rs

@@ -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(),

server/src/crdt_state/write/migrations.rs

@@ -339,6 +339,8 @@ mod stage_migration_tests {
                 "4_merge_failure",
                 Stage::MergeFailure {
                     reason: String::new(),
+                    feature_branch: crate::pipeline_state::BranchName(String::new()),
+                    commits_ahead: NonZeroU32::new(1).unwrap(),
                 },
             ),
         ];