Git stops. Markers everywhere. Power Agents asks you whether to resolve via a model — and which model — then writes only after you confirm.
TL;DR
| Surface | Command |
|---|---|
| VS Code | Command Palette → Power Agents: Auto-resolve merge conflicts |
| CLI | pc merge-resolve |
| Setting | powerClaude.mergeResolve.defaultModel (default grok-4) |
| Unattended | --yes + --model only when you mean it |
Why this is not "the agent silently mashed the merge"
Unattended landing already has a headless resolver with a 90-second cap. This feature is the human path: a prompt, a default model, a selectable override, and a fail-closed check — if any conflict marker survives, nothing is written.
What stays decoupled
- The resolver — parses the conflict, prompts the model, applies the result. No git, no editor, no vendor SDK inside it.
- The detector — spots the conflict markers and runs the prompt in the terminal.
- The VS Code adapter — the same prompt as a Quick Pick, with the editor's language-model access.
- Power Agents — the command, the setting, and
pc merge-resolveon every host SKU.
You can swap the model (Grok, Claude, Codex, or the editor's own) without touching the parser, so the agent you run never dictates the model that fixes your merge.
FAQ
Does it pick a side blindly? No. The prompt asks the model to keep both sides' intent and refuses leftover conflict markers.
Can I keep my default? Yes. The default is grok-4. Change the setting or pick at the prompt.
Will unattended landing start charging my model? No. Unattended land-branch never pops this prompt — the terminal, the Command Palette, and pc merge-resolve only.
Is this Claude-only? No. It ships on Power Agents (every host SKU) and the harness CLI.