ninehills/skills
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Installation
$
npx skills add https://github.com/ninehills/skills
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 installsAlso in this package
Other skills from ninehills/skills · top by installs.
npx skills add https://github.com/ninehills/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
281
Default branch
main
Open issues
0
Status
Active
History
- First seen on skills.sh
- First recorded snapshot · 5 installs