merge
Performs a three-way merge of two branched memory files against a common base, resolving conflicts with a configurable winner strategy.
Instructions
Three-way merge branching .abhi memory files (waggle merge). Merges left and right branches against a common base into one output file. Conflicts surface as CONTRADICTS edges — nobody else can do this. Use --merge-strategy to control winner selection when both sides changed the same object.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| output_path | Yes | Destination path for the merged .abhi file. | |
| merge_strategy | No | Winner strategy when both sides changed the same object differently. | prefer_right |
| base_input_path | Yes | Path to the common base .abhi file. | |
| left_input_path | Yes | Path to the left branch .abhi file (ours). | |
| right_input_path | Yes | Path to the right branch .abhi file (theirs). |