skills/.changeset/resolving-merge-conflicts.md
Matt Pocock 47bde84da0 feat: introduce new skills and refine existing ones
- Add `ask-matt` skill for user-invoked routing.
- Introduce `codebase-design` and `domain-modeling` skills, updating dependencies.
- Remove unused `caveman` and `zoom-out` skills.
- Rename `diagnose` skill to `diagnosing-bugs`.
- Add `resolving-merge-conflicts` skill for handling git conflicts.
- Tighten `review` skill with improved checks.
- Update skill taxonomy to user-invoked and model-invoked.
- Replace `write-a-skill` with `writing-great-skills` for better guidance.
2026-06-17 15:39:06 +01:00

5 lines
202 B
Markdown

---
"mattpocock-skills": minor
---
Add the **`resolving-merge-conflicts`** skill — a loop for resolving an in-progress git merge or rebase conflict. Standalone, with no dependencies on other skills.