SkillsAdd

troykelly/claude-skills

conflict-resolution

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

First seen Jan 24, 2026

Installation

$ npx skills add https://github.com/troykelly/claude-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.

fusion-github-review-resolution Similar name
equinor/fusion-skills

Resolves unresolved GitHub PR review threads end-to-end: evaluates whether each review comment …

2.2K installs
ticket-resolution Similar name
hubspot/agent-cli-skills

Create, triage, advance, and close HubSpot support tickets — pipeline discovery, contact/compan…

1.6K installs
ontology-term-resolution Similar name
k-dense-ai/scientific-agent-skills

Resolve free-text scientific labels to ontology term IDs and validate existing CURIEs against t…

15 installs

Also in this package

Other skills from troykelly/claude-skills · top by installs.

npx skills add https://github.com/troykelly/claude-skills
pexels-media 295 postgres-rls 205 documentation-audit 78 database-architecture 61 postgis 57 memory-integration 56 security-review 50 acceptance-criteria-verification 43 comprehensive-review 41 worker-handover 33

Browse all from troykelly/claude-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 11
Default branch main
Open issues 1
Status Active

History

  1. First seen on skills.sh
  2. First recorded snapshot · 164 installs