huskies: merge 773

This commit is contained in:
dave
2026-04-28 10:19:43 +00:00
parent 83f7e41932
commit 7faacb6664
9 changed files with 167 additions and 133 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
//! Merge operations — rebases agent work onto master and runs post-merge validation.
use serde::Serialize;
use serde::{Deserialize, Serialize};
mod squash;
@@ -28,7 +28,7 @@ pub struct MergeJob {
}
/// Result of a mergemaster merge operation.
#[derive(Debug, Serialize, Clone)]
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct MergeReport {
pub story_id: String,
pub success: bool,