pub mod config;
pub mod config_loader;
pub mod error;
pub mod git;
pub mod hooks;
pub mod interactive;
pub mod merge_executor;
pub mod merge_planner;
pub mod model;
pub mod party_resolver;
pub mod report;
pub use config::{Config, Party, ConflictMode, ConflictPolicy, MergeOrderStrategy, AutoUpdateConfig, AutoUpdateParties};
pub use config_loader::{ConfigLoader, CliOverrides};
pub use error::{Error, Result};
pub use git::{GitRepo, MergeResult as GitMergeResult};
pub use hooks::GitHookManager;
pub use interactive::InteractiveSelector;
pub use merge_executor::{MergeExecutor, ExecutionOptions, ExecutionOptionsBuilder};
pub use merge_planner::{MergePlanner, format_plan};
pub use model::{BranchSpec, MergePlan, MergeStep, RepoState};
pub use party_resolver::{PartyResolver, ResolvedParty};
pub use report::{RunReport, MergeResult, MergeStatus, EnvironmentInfo};