SkillsAdd

mattpocock/skills

resolving-merge-conflicts

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

All-time #76 Trending #43 Hot #6810 First seen Jun 4, 2026
8-week activity · all time api

Installation

$ npx skills add https://github.com/mattpocock/skills
View on skills.sh ↗ GitHub repository ↗

Similar popular skills

Related neighbors and high-traction skills in the same topics — useful to compare before installing.

resolving-merge-conflicts Similar name
vinvcn/mattpocock-skills-zh-cn

适用于需要解决正在进行的 git merge/rebase 冲突时。

3K installs

Security audits

Partner security reviews for this skill.

agent-trust-hub SAFE

Analyzed Aug 19, 2026

The skill provides instructions for resolving git conflicts but is susceptible to indirect prompt injection as it processes untrusted data like commit messages and PR details.

snyk MEDIUM

Analyzed Aug 19, 2026

[MEDIUM] W011: Third-party content exposure detected (indirect prompt injection risk).

socket Score 0.9000 · 0 alerts

Analyzed Aug 19, 2026

  • license 1
  • maintenance 1
  • quality 0.9
  • supply chain 1
  • vulnerability 1

0 alerts

Also in this package

Other skills from mattpocock/skills · top by installs.

npx skills add https://github.com/mattpocock/skills
grill-me 1.1M grill-with-docs 930.4K improve-codebase-architecture 891.6K tdd 863.5K setup-matt-pocock-skills 796.8K handoff 764.8K triage 751.4K prototype 743.9K grilling 652.6K teach 617.6K

Browse all from mattpocock/skills

More details

Agent compatibility

Declared targets from SKILL.md / docs. Unmarked agents are not listed — the skill may still install via the CLI.

Claude Code Not declared
Cursor Not declared
Codex Not declared
GitHub Copilot Not declared
Windsurf Not declared
Gemini CLI Not declared
Cline Not declared
OpenCode Not declared

Repository health

Stars 256.9K
License MIT
Default branch main
Open issues 484
Last push Sep 4, 2026
Status Active

History

  1. First seen on skills.sh
  2. First recorded snapshot · 452,400 installs