Resolving Merge Conflicts

Coding551.2K installs

What it does

Use when you need to resolve an in-progress git merge/rebase conflict.

npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts

From the skill’s SKILL.md or README, by its authors. View the original

See the current state of the merge/rebase. Check git history, and the conflicting files.

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.

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.

Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.

Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Coding
Improve Codebase Architecture
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
npx skills add https://github.com/mattpocock/skills --skill improve-codebase-architecture
1.2M installs
Coding
Vercel React Best Practices
React and Next.js performance optimization guidelines from Vercel Engineering. This skill should be used when writing, reviewing, or refactoring React/Next.js code to ensure optimal performance patterns. Triggers on tasks involving React components, Next.js pages, data…
npx skills add https://github.com/vercel-labs/agent-skills --skill vercel-react-best-practices
881K installs
Coding
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 standards?) and Spec (does the code match what the originating issue/spec asked for?). Runs both reviews in parallel…
npx skills add https://github.com/mattpocock/skills --skill code-review
866.7K installs
Coding
Git Guardrails Claude Code
Set up Claude Code hooks to block dangerous git commands (push, reset --hard, clean, branch -D, etc.) before they execute. Use when user wants to prevent destructive git operations, add git safety hooks, or block git push/reset in Claude Code.
npx skills add https://github.com/mattpocock/skills --skill git-guardrails-claude-code
546.1K installs

Skills are shared by members and not reviewed by us. Read a skill’s code before you install it.