SkillsAdd

joyco-studio/skills

resolving-git-conflicts

Diagnose and resolve git conflicts of any kind — merge, rebase, cherry-pick, stash, revert. Use this skill EVERY time conflicts appear during work, or whenever…

First seen Jun 15, 2026

Installation

$ npx skills add https://github.com/joyco-studio/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
mattpocock/skills

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

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

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

3K installs
resolving-merge-conflicts Similar name
timschoch/mattpocock-skills

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

176 installs
resolving-merge-conflicts Similar name
tt-a1i/matt-skills-with-to-goal

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

105 installs

Also in this package

Other skills from joyco-studio/skills · top by installs.

npx skills add https://github.com/joyco-studio/skills
pr-description-writer 81 trace-audit 54 parallel-claudes 50 markdown-content 47 joyco-lab 41 thrash-report-analyzer 30 skill-writer 25 webaudio 24 joyco-app 14 joyco-logs 13

Browse all from joyco-studio/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 12
Default branch main
Open issues 1
Status Active

History

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