Merge Logic & Flow
The deterministic decision tree behind every automated resolution.
Automated Triage
gitresolve processes every conflict through a multi-tier confidence engine. We only automate when the risk of logic corruption is statistically negligible or explicitly allowed by your Policy Profile.
Trivial Normalization
Whitespace shifts, identical line changes, or purely comment updates. Handled via bitwise line comparison.
Structured Native Merge
JSON, YAML, or TOML edits that don't overlap on the same key. Uses 3-way object tree merging.
Semantic Import Deduplication
Merging additions of new packages or libraries without duplicating the import block header.
Logical Escalation
Function signature changes, deletion of used logic. These halt automation and require auditor review.
Symmetric Brace Recovery
Standard Git merge markers often cut through code structures, leaving unbalanced braces ({ or }) which break the compiler. gitresolve uses a Lookahead Recovery algorithm: when it identifies a conflict inside a code block, it scans the surrounding context to ensure all braces remain balanced in the final resolution.
The 3-Way Merge Process
Unlike simple "Ours vs Theirs", gitresolve attempts to find a Base Ancestor for every block. This allows us to determine what actually changed on each side:
- If Side A changed line 5 and Side B is identical to Base, we apply Side A automatically.
- If both Side A and Side B changed from Base but in the same way, we deduplicate.
- If both changed from Base differently, we escalate to the Interactive Orchestrator.