ai-resolve-conflictslisted

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/ai-engineering · ★ 49 · AI & Automation · score 84

Install: claude install-skill arcasilesgroup/ai-engineering

# Resolve Conflicts ## Purpose Intelligent git conflict resolution. Detects conflict type, categorizes files by resolution strategy, and resolves conflicts with awareness of both sides' intent. Handles lock files, migrations, and code conflicts differently. ## Trigger - Command: `/ai-resolve-conflicts` - Context: git operation resulted in conflicts (rebase, merge, cherry-pick, revert). - Auto-detect: `git status` shows "Unmerged paths" or "both modified". ## Workflow 1. **Detect conflict type** -- determine the operation that caused conflicts: ```bash # Check which operation is in progress test -d .git/rebase-merge || test -d .git/rebase-apply # rebase test -f .git/MERGE_HEAD # merge test -f .git/CHERRY_PICK_HEAD # cherry-pick test -f .git/REVERT_HEAD # revert ``` 2. **List conflicted files** -- `git diff --name-only --diff-filter=U` 3. **Categorize each file** by resolution strategy: | Category | File patterns | Strategy | |----------|--------------|----------| | Lock files | `*.lock`, `poetry.lock`, `Cargo.lock`, `package-lock.json`, `uv.lock` | Accept theirs, regenerate | | Migrations | `migrations/`, `alembic/versions/` | Ask user (order matters) | | Generated | `*.min.js`, `*.min.css`, `dist/`, `build/` | Accept theirs, rebuild | | Config | `*.yml`, `*.toml`, `*.json` (non-lock) | AI merge with validation | | Code | everything e