Auto-invokedSkill
ask-matt
Ask which skill or flow fits your situation. A router over the skills in this repo.
@mattpocockView Skill/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Install
$ npx -y skills add mattpocock/skills --skill resolving-merge-conflicts --agent claude-codeHow it fires
How this skill gets triggered: by you, by Claude, or both.
- Fires itselfAuto-invocation. Claude auto-loads it when your prompt matches the work.Auto-invocation is when the right skill fires by itself at the right moment, driven by a FLOW.md router and a hook, instead of you invoking it by name. It is the difference between a skill being installed and a skill actually getting used.Read the full definition →
- You can call itInvoke it directly when you want it.
- Slash command
/resolving-merge-conflicts
Context preview
The summary Claude sees to decide when to auto-load this skill.
Use when you need to resolve an in-progress git merge/rebase conflict.
SKILL.md
resolving-merge-conflicts.SKILL.mdname: resolving-merge-conflicts description: "Use when you need to resolve an in-progress git merge/rebase conflict."
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Ships withmattpocock-skills
My agent skills that I use every day to do real engineering - not vibe coding. Developing real applications is hard. Approaches like GSD, BMAD, and Spec-Kit try to help by owning the process.
Get the whole plugin, auto-invoked Stats
260,424
Stars
21,963
Forks
Active
Maintenance
Shell
Language
MIT
License
10d ago
Last commit
7mo ago
Created
2mo ago
Added
Repo: mattpocock/skills
Other skills on mattpocock-skills.
@mattpocockView SkillAuto-invokedSkill
code-review
Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code follow this repo's documented coding…
@mattpocockView SkillAuto-invokedSkill
codebase-design
Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a…
@mattpocockView SkillAuto-invokedSkill
diagnosing-bugs
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.
@mattpocockView SkillAuto-invokedSkill
domain-modeling
Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a CONTEXT.md, or recording or editing an ADR.
@mattpocockView SkillAuto-invokedSkill
grill-with-docs
A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go.
@mattpocockView Skill