Expand description
Merge — 3-way merge with conflict detection.
Finds common ancestor, computes diffs from both branches, detects conflicts (same subject+predicate with different objects), and produces either a clean merge or a conflict report.
Structs§
- Conflict
- A merge conflict: same (subject, predicate, namespace) with different objects.
Enums§
- Merge
Error - Errors from merge operations.
- Merge
Result - Result of a merge operation.
- Merge
Strategy - Strategy for automatic conflict resolution during merge.
- Resolution
- How to resolve a single conflict.
Functions§
- merge
- Perform a 3-way merge between two commits.
- merge_
with_ strategy - Perform a 3-way merge with automatic conflict resolution.