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.

LocalClaimTracker

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

ReleasedLock

Result of releasing locks for a session. Contains the symbols that were released, so callers can emit symbol.lock.released events.

SymbolClaim

A claim that a particular session has touched a symbol.

SymbolLocked

Information about a symbol lock held by another session. Returned when acquire_lock finds the symbol is already locked.

Enums

AcquireOutcome

Outcome of a successful acquire_lock call.

Traits

ClaimTracker

Async trait for symbol-level claim tracking across sessions.