Expand description
Conflict resolution for concurrent edits
Structs§
- Conflict
- A conflict between two versions
- Conflict
Resolution - Conflict resolution result
- Conflict
Resolver - Conflict resolver
Enums§
- Merge
Strategy - Merge strategy for conflict resolution