batty_cli/team/merge/mod.rs
1//! Merge orchestration extracted from the team daemon.
2//!
3//! This module owns the completion path after an engineer reports a task as
4//! done in a worktree-based flow. It validates that the branch contains real
5//! work, runs the configured test gate, serializes merges with a lock, and
6//! either lands the branch on `main` or escalates conflicts and failures back
7//! through the daemon.
8//!
9//! The daemon calls into this module so the poll loop can stay focused on
10//! orchestration while merge-specific retries and board transitions remain in
11//! one place.
12
13mod completion;
14mod git_ops;
15mod lock;
16mod operations;
17
18pub(crate) use completion::handle_engineer_completion;
19pub(crate) use lock::MergeOutcome;
20pub(crate) use operations::merge_engineer_branch;