AI Resolve Conflicts

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.

arcasilesgroup Updated 65 repo stars
claudeline running inside Claude Code during an active session: model name with 1M context, ✍️ context %, working directory and dirty git branch, effort glyph,

File contents

arcasilesgroup/claudeline commit 645ab483c4

Frequently asked questions

npx get-skill add arcasilesgroup/ai-resolve-conflicts