Skip to main content

dk_engine/conflict/
mod.rs

1pub mod ast_merge;
2mod claim_tracker;
3pub mod payload;
4#[cfg(feature = "valkey")]
5mod valkey_claim_tracker;
6
7pub use ast_merge::{ast_merge, MergeResult, MergeStatus, SymbolConflict};
8pub use claim_tracker::{
9    AcquireOutcome, ClaimTracker, ConflictInfo, LocalClaimTracker, ReleasedLock, SymbolClaim,
10    SymbolLocked,
11};
12pub use payload::{
13    build_conflict_block, build_conflict_detail, ConflictBlock, SymbolConflictDetail,
14    SymbolVersion,
15};
16#[cfg(feature = "valkey")]
17pub use valkey_claim_tracker::ValkeyClaimTracker;