Documentationv1.4.0

Merge Logic & Flow

The deterministic decision tree behind every automated resolution.

Automated Conflict Triage

gitresolve evaluates each conflict block against language-specific grammar and policy constraints. We only auto-resolve when the probability of semantic logic distortion is provably zero.

Trivial Normalization

Whitespace shifts, indentation alignment, identical code lines, or comments. Handled via bitwise line deduplication.

Structured 3-Way Object Merge

Non-overlapping JSON, YAML, or TOML key edits. Deep recursive tree merging with conservative array unioning.

Semantic Import Deduplication

Merging additions of new packages or libraries across multiple branches without duplicating import declarations.

Structural Logic Escalation

Function signature changes, type alterations, or deletion of active call sites. Escalated for human review with suggested fix.

Symmetric Brace Recovery

Preventing syntax fractures caused by naive line cutting.

Standard Git merge markers often bisect code structures, leaving unclosed brackets ({ or }) that produce immediate compiler failure. gitresolve applies lookahead AST scanning: when a conflict block is detected inside a scope, it calculates surrounding delimiter balance to guarantee valid syntax closure.

Supported Languages: Go, Java, TypeScript, JavaScript, Python

The 3-Way Merge Process

Comparing against common ancestor commits to identify genuine intent.

1. One-Sided Modification

If Side A modified a block and Side B is identical to the Base ancestor commit, Side A is auto-applied seamlessly.

2. Identical Modifications

If both sides made identical edits relative to the Base ancestor, they are deduplicated automatically.

3. Divergent Modifications

If both sides made different structural edits to the same logic, the engine runs the History-Aware Escalation scoring matrix and presents an interactive prompt.