use argonauts_core::TaskId;
use crate::engine::host::Host;
use crate::error::EngineResult;
pub mod absorb;
pub mod branch;
pub mod commit_message;
pub mod conductor;
pub mod copies;
pub mod deliver;
pub mod detached;
pub mod diff;
pub mod final_check;
pub mod in_the_way;
pub mod kept;
pub mod land;
pub mod merge_packet;
pub mod merger;
pub mod step;
pub mod task_merge;
pub mod unborn;
pub mod your_folder;
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum TaskMerge {
Merged { sha: String },
Conflict { files: Vec<String> },
TestsFailed { output: String },
}
pub async fn merge_task(host: &Host, task: &TaskId) -> EngineResult<TaskMerge> {
task_merge::merge(host, task).await
}