Module merge 

Three-way merge algorithm for patch sets.

Given a common base and two branches (A and B), the merge algorithm:

1. Identifies patches unique to each branch
2. Checks for conflicts (overlapping touch sets)
3. Produces a merged patch set with conflict nodes where needed

Correctness

Per THM-MERGE-001 (YP-ALGEBRA-PATCH-001): The merge result is deterministic and independent of branch processing order.

Structs

MergeResult

Result of a merge operation.

Enums

MergeError

Errors that can occur during merge operations.

Functions

detect_conflicts

Detect all conflicts between two patch sets without performing a full merge.

merge

Perform a three-way merge of two patch sets.