merge-resolverlisted

# Merge Resolver Resolve merge conflicts by analyzing git history and commit intent. ## Quick Start ```bash # Resolve conflicts for a specific PR python3 .claude/skills/merge-resolver/scripts/resolve_pr_conflicts.py \ --pr-number 123 --branch-name "fix/my-feature" --target-branch "main" # Dry-run mode (no side effects) python3 .claude/skills/merge-resolver/scripts/resolve_pr_conflicts.py \ --pr-number 123 --branch-name "fix/test" --dry-run ``` ## Triggers | Trigger Phrase | Operation | |----------------|-----------| | `resolve merge conflicts` | Auto-detect branch/PR and resolve | | `fix conflicts on this branch` | Context-aware conflict resolution | | `PR has conflicts with main` | Merge-based conflict resolution | | `can't merge due to conflicts` | Analyze and fix blocking conflicts | | `resolve PR conflicts` | Resolve conflicts for a specific PR number | ## Process ### Phase 1: Context Gathering | Step | Action | Verification | |------|--------|--------------| | 1.1 | Fetch PR metadata via `gh pr view` | PR metadata displayed | | 1.2 | Checkout PR branch | `git branch --show-current` matches | | 1.3 | Attempt merge with base (`--no-commit`) | Conflict markers created | | 1.4 | List conflicted files | `git diff --name-only --diff-filter=U` output | ### Phase 2: Analysis and Resolution | Step | Action | Verification | |------|--------|--------------| | 2.1 | Classify files (auto-resolvable vs manual) | Classification logged | | 2.2 | Auto-resolve known pat