Module conflict 

Re-exports

pub use ast_merge::ast_merge;

pub use ast_merge::MergeResult;

pub use ast_merge::MergeStatus;

pub use ast_merge::SymbolConflict;

pub use payload::build_conflict_block;

pub use payload::build_conflict_detail;

pub use payload::ConflictBlock;

pub use payload::SymbolConflictDetail;

pub use payload::SymbolVersion;

Modules

ast_merge

AST-aware smart merge: operates at the SYMBOL level, not the line level.

payload

Self-contained conflict payloads for the SUBMIT response.

Structs

ConflictInfo

Information about a detected conflict: another session already claims ownership of a symbol that the current session wants to modify.

SymbolClaim

A claim that a particular session has touched a symbol.

SymbolClaimTracker

Thread-safe, lock-free tracker for symbol-level claims across sessions.