---
description: 'Resolves git conflicts intent-aware: categorizes by type (lock files, migrations, generated, config, code), regenerates or merges per category, never blindly accepts. Trigger for ''I have conflicts'', ''rebase failed'', ''merge conflict'', ''cherry-pick failed'', ''unmerged paths''. Not for branch hygiene; use /ai-branch-cleanup instead. Not for committing the resolution; use /ai-commit instead.'
mirror_family: opencode-commands
generated_by: ai-eng sync
canonical_source: .claude/skills/ai-resolve-conflicts/SKILL.md
edit_policy: generated-do-not-edit
---

Use the `ai-resolve-conflicts` skill to handle this request. OpenCode will lazy-load the canonical skill body via the `skill` tool; arguments below are forwarded verbatim.

$ARGUMENTS
