Documentationv1.4.0

resolve

Interactive orchestration and automatic conflict resolution.

resolve

The primary interactive interface. Use resolve to step through conflicted blocks. It combines auto-resolution for trivial blocks with an interactive prompt for logical conflicts.

bash

$gitresolve resolve

[Scalar] main.go (L21-25)

[O]urs: // this comment is different

[T]heirs: // this is a comment

Options: [O]urs [T]heirs [B]oth [M]anual [S]kip

Select action: _

--non-interactive

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

--timeout <duration>

Auto-select 'theirs' after a timeout (e.g., 30s) during interactive prompts.

--strategy <type>

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

--enforce-gates

Apply release gates based on manual escalation rates.

--path <glob>

Only resolve conflicts in files matching the specified glob pattern.

--dry-run

Preview resolutions without writing any changes to disk.