Documentationv1.4.0

resolve

Interactive orchestration and automatic conflict resolution with structural risk escalation.

resolve
bash
$gitresolve resolve

The primary interactive interface. Use resolve to step through conflicted blocks. It integrates the History-Aware Escalation Layer to perform pre-resolve divergence checks, evaluates structural risks (blast radius, coupled files, import cycles), and automatically merges safe trivial blocks while guiding complex blocks.

output
Warning: branch is 15 commits behind main — alice@example.com authored changes touching files you also modified
suggested: git fetch && git rebase origin/main
Conflict in internal/payments/charge.go (lines 45-58):
reason: ProcessPayment is called from 14 other locations — escalating for manual review
suggested: go test ./... (run full suite before committing)
Select resolution [1: ours, 2: theirs, 3: manual, 4: abort]: _

Command Options

--file <path>

Resolve conflicts in a specific file only.

--verbose, -v

Print full factual evidence (AST diff, historical authors, file couplings, decision log row) on escalation.

--skip-sync-check

Bypass pre-resolve branch divergence check against remote default branch.

--non-interactive

Exit with status 1 if any conflict requires human input. Perfect for CI gates.

--dry-run

Preview resolutions and escalation warnings without writing any changes to disk.

--strategy <type>

Force a fixed strategy (ours/theirs/both/interactive) for all conflicts.

--policy-profile <p>

Override active policy profile (strict, balanced, aggressive, auto).

--timeout <duration>

Timeout for interactive prompt (e.g. 30s). Auto-selects theirs if reached.