Best PromptsResolving Merge Conflicts Skill
Resolve merge and rebase conflicts by intent: trace each side to its commits, PRs, and tickets, preserve both goals, and never invent new behaviour.
--- name: 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.
How to use
Five steps that encode the senior-engineer instinct: conflicts are about intent, not text, so the skill reads commit messages, PRs, and tickets before touching a hunk. The two hard rules (never invent behaviour, never --abort) are what make it safe to hand a rebase to an agent. Run the project's checks at the end; a merge that typechecks isn't necessarily a merge that's right, but one that doesn't is definitely wrong. Save as .claude/skills/resolving-merge-conflicts/SKILL.md, or install Matt's full MIT-licensed set (github.com/mattpocock/skills) with 'claude plugins install mattpocock-skills'.
More skill prompts
--- name: writing-documentation description: Write or update documentation from the code. Use when the user asks for a README, API reference, guide, docstrings, or says the docs are out of date. --- # Writing Documentation Documentation is a claim about behavior. Every claim must be checked against the code before it ships, because a wrSKILL.md
Documentation Skill
A skill that documents what the code does rather than what it should do: read first, examples from tests, unverifiable claims marked.
--- name: security-review description: Review code for security defects. Use before merging changes that touch authentication, authorization, user input, file handling, secrets, or external requests, or when the user asks for a security review. --- # Security Review Find defects an attacker could actually use. A finding without an attacSKILL.md
Security Review Skill
A skill that reviews changes for exploitable defects, follows untrusted input to where it lands, and reports only findings with an attack path.
--- name: accessibility-review description: Audit UI code for accessibility defects against WCAG. Use when building or changing components, forms, modals, or navigation, or when the user asks about accessibility, a11y, screen readers, or keyboard support. --- # Accessibility Review Judge the interface by whether a person can complete thSKILL.md
Accessibility Skill
A skill that audits UI against WCAG by keyboard, semantics, and state, reporting who is blocked rather than listing rule numbers.