Structs§
- Agent
Priority Resolver - Multi-agent conflict resolver that prioritizes by agent ID or timestamp Useful when merging work from multiple agents with different priorities
- Ignore
Conflicts Resolver - Default conflict resolver that ignores all conflicts (treats them as no-ops)
- Merge
Conflict - Semantic
Merge Resolver - Semantic merge resolver for AI agent scenarios Attempts to merge values semantically when they’re both JSON or similar structured data
- Take
Destination Resolver - Conflict resolver that always takes the destination value
- Take
Source Resolver - Conflict resolver that always takes the source value
- Timestamp
Resolver - Timestamp-based conflict resolver for multi-agent scenarios Resolves conflicts by preferring the most recent change
Enums§
Traits§
- Conflict
Resolver - Trait for resolving merge conflicts