branch-resolve-conflicts
Use when a git merge or rebase hits complex conflicts, or the user says "resolve conflicts" / "fix merge conflicts". Reconstructs intent, preserves both branches' goals when possible, and runs automated checks.
- License
- MIT
- Compatibility
- claude-code codex opencode
Pinned to revision 826430aad9ae, so it is the text this page describes rather than whatever the author pushed since.
Pre-approved tools experimental
Experimental field. Support varies between clients, so this list is what the author declared, not what your client will enforce.
- Read
- Edit
- Bash
- Grep
- Glob
Files
- skills/branch-resolve-conflicts/SKILL.md
- skills/branch-resolve-conflicts/README.md
- skills/branch-resolve-conflicts/agents/openai.yaml
- skills/branch-resolve-conflicts/examples.md
Every link opens the file at its source, pinned to the revision this page describes.