History-Aware Escalation
Local, deterministic structural risk scoring and suggested remediation commands.
Zero-AI, 100% Deterministic Risk Scoring
gitresolve incorporates a local, dependency-free escalation layer. Before touching any conflict file, the engine mines repository Git history and inspects AST call trees to answer two questions:
- Why did this conflict happen? (e.g. stale branch divergence, simultaneous edits by teammates).
- What is the blast radius? (e.g. widely referenced symbols, un-modified coupled partner files, dependency cycles).
When structural risk exceeds policy thresholds, gitresolve escalates the block for human review with an informative 2-line explanation and a suggested command rendered from parameterized templates filled strictly from verified repository facts.
semantic.high_blast_radiusBlast Radius Analysis
Detects when a modified function or symbol is referenced by more than 10 other locations across the codebase.
semantic.missing_coupled_fileMissing Coupled Files
Detects when historical co-change strength >= 0.60 indicates a paired file should have been modified, but was not.
semantic.import_cycleImport Cycle Detection
Evaluates Go package dependency graphs using Tarjan's SCC algorithm to flag conflicts sitting inside cyclic dependencies.
strategy.stale_branch_divergenceStale Branch Divergence
Pre-flight check running before resolution to detect branches falling behind remote default branch with overlapping authors.
CLI Terminal Experience
Clean 2-line summary in default mode; comprehensive evidence audit in verbose mode.
1. Default View (Interactive Escalation)
2. Verbose Evidence View (--verbose / -v)
Namespaced Reason Codes
Stable reason codes written to the SQLite decision_logs table.
| Reason Code | Category | Severity | Trigger Condition |
|---|---|---|---|
| semantic.high_blast_radius | Semantic | High | Callee count > max_callers (default 10) |
| semantic.missing_coupled_file | Semantic | Medium | Co-change strength ≥ 0.60, partner file untouched |
| semantic.import_cycle | Semantic | High | File package is member of a Tarjan SCC cycle |
| strategy.stale_branch_divergence | Strategy | Medium | Behind commits > max_divergence_commits |
| strategy.multi_author_conflict | Strategy | Info | Conflicted sides have distinct historical contributors |
Performance Guarantees
Graph build + rule evaluation is designed to add negligible overhead to the resolve pipeline.
Upper bound ceiling for full graph build on large repositories.
Measured over 5,000 commits and 2,000 files in synthetic suite.
Cached commit SHAs in SQLite enable near-instant re-runs.