Skip to main content

void_core/ops/merge/
mod.rs

1//! Merge operations for void repositories.
2//!
3//! This module implements merge operations including:
4//! - Fast-forward merge for linear history
5//! - Three-way merge with conflict detection
6//! - Merge state management (continue/abort)
7
8mod commit;
9mod conflicts;
10mod fast_forward;
11mod helpers;
12mod state;
13mod three_way;
14mod types;
15
16#[cfg(test)]
17mod tests;
18
19pub use fast_forward::merge_fast_forward;
20pub use state::{merge_abort, merge_continue};
21pub use three_way::merge;
22pub use types::{ConflictInfo, ConflictType, MergeOptions, MergeResult};