Module diff

Source

Structs§

AgentPriorityResolver
Multi-agent conflict resolver that prioritizes by agent ID or timestamp Useful when merging work from multiple agents with different priorities
IgnoreConflictsResolver
Default conflict resolver that ignores all conflicts (treats them as no-ops)
MergeConflict
SemanticMergeResolver
Semantic merge resolver for AI agent scenarios Attempts to merge values semantically when they’re both JSON or similar structured data
TakeDestinationResolver
Conflict resolver that always takes the destination value
TakeSourceResolver
Conflict resolver that always takes the source value
TimestampResolver
Timestamp-based conflict resolver for multi-agent scenarios Resolves conflicts by preferring the most recent change

Enums§

DiffResult
MergeResult

Traits§

ConflictResolver
Trait for resolving merge conflicts