resolving-merge-conflicts
Agent skill from mattpocock/skills.
Claude Code
Source
Repository: https://github.com/mattpocock/skills
Maintain resolving-merge-conflicts?
Let people know it's listed here — add the badge (live metrics, light/dark aware) or a plain link to your README or docs.
[](https://getagentictools.com/skills/mattpocock-skills-resolving-merge-conflicts?ref=badge) Related skills
using-git-worktrees Isolated git worktrees with smart directory selection and safety verification.
firebase-basics >-
firebase-data-connect PostgreSQL-backed GraphQL backend with auto-generated type-safe SDKs for web, mobile, and Flutter.
firebase-firestore >-
pr-walkthrough pr walkthrough
git-guardrails-claude-code git guardrails claude code