Expand description
3-Way AST Structural Merge for VibeScript.
Reconciles concurrent edits from the visual Studio canvas (ours) and the textual
code editor (theirs) against a shared ancestor AST (base). Non-conflicting additions,
modifications, and property edits are merged deterministically.
Structs§
- Merge
Conflict - A conflict where two branches modified the same AST node incompatibly.
- Merge
Result - Result of a 3-way AST merge operation.
Functions§
- merge_
programs - Perform a 3-way structural merge on VibeScript programs.