resolve
Interactive orchestration and automatic conflict resolution with structural risk escalation.
resolveThe 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.
Command Options
--file <path>Resolve conflicts in a specific file only.
--verbose, -vPrint full factual evidence (AST diff, historical authors, file couplings, decision log row) on escalation.
--skip-sync-checkBypass pre-resolve branch divergence check against remote default branch.
--non-interactiveExit with status 1 if any conflict requires human input. Perfect for CI gates.
--dry-runPreview 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.