gk ai resolve plan
Generate a reviewable resolution plan
Synopsis
Generate a reviewable, read-only conflict resolution plan.
Use –output json for the full plan on stdout, or –plan-file to save the full plan atomically (mode 0600 on POSIX; on Windows it inherits the directory’s ACLs). These output modes cannot both be requested explicitly. Prefer –plan-file: refine-plan and apply-plan both take a saved plan path.
Examples: gk ai resolve plan –plan-file /tmp/resolve-plan.json gk ai resolve plan –output json gk ai resolve plan –file “src/a file.ts” –instructions “keep validation” –output json gk ai resolve plan –fallback ours –fallback-only –plan-file /tmp/resolve-plan.json
gk ai resolve plan [flags]
Options
--fallback string Fallback strategy when AI fails or is unavailable: ours or theirs
--fallback-only Resolve directly from --fallback without initializing or calling an AI provider
--file stringArray Exact repository-relative conflicted path to resolve (repeatable)
-h, --help help for plan
--instructions string Guidance for AI resolution
--max-steps int Maximum model tool-calling steps per file (default 15)
--plan-file string Write the complete plan atomically (0600 on POSIX)
Options inherited from parent commands
--no-telemetry Disable telemetry (OTel spans, Sentry) for this invocation
--output string Output format: text or json (default "text")
--session string (Optional) Isolate auth and cache under a named session
--workdir string Path to the git repository to operate on (default: current directory)
SEE ALSO
- gk ai resolve - Plan, review, and stage AI conflict resolutions