git-resolve-conflicts
Installation
SKILL.md
Contains Shell Commands
This skill contains shell command directives (!`command`) that may execute system commands. Review carefully before installing.
/git:resolve-conflicts
Resolve merge conflicts in pull requests automatically.
When to Use This Skill
| Use this skill when... | Use git-ops agent instead when... |
|---|---|
| PR has merge conflicts with base branch | Complex multi-branch rebase workflows |
| Automated merge failed due to conflicts | Cherry-pick conflicts across many commits |
| Config files (JSON, YAML) diverged | Conflicts require deep business logic understanding |
| Base branch updates caused conflicts | Interactive rebase with squash/fixup needed |
Context
- Current branch: !
git branch --show-current - Git status: !
git status --porcelain=v2 --branch - Conflicted files: !
git diff --name-only --diff-filter=U - Recent commits on current branch: !
git log --format='%h %s' --max-count=5