Skip to main content

Module ast_merge

Module ast_merge 

Source
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§

MergeConflict
A conflict where two branches modified the same AST node incompatibly.
MergeResult
Result of a 3-way AST merge operation.

Functions§

merge_programs
Perform a 3-way structural merge on VibeScript programs.