Module conflict 

Semantic conflict detection for three-way merge.

Instead of purely textual diff3, this module parses all three versions of a file (base, head, overlay) with tree-sitter and compares the resulting symbol tables. Conflicts arise when both sides modify, add, or remove the same symbol.

Structs

SemanticConflict

Describes a single semantic conflict within a file.

Enums

MergeAnalysis

Result of analyzing a file for three-way merge.

SymbolChangeKind

Classification of a symbol change relative to the base version.

Functions

analyze_file_conflict

Analyze a single file for semantic conflicts across three versions.