vinvcn/mattpocock-skills-zh-cn
resolving-merge-conflicts
适用于需要解决正在进行的 git merge/rebase 冲突时。
8-week activity · all time api
Installation
$
npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn
Similar popular skills
Related neighbors and high-traction skills in the same topics — useful to compare before installing.
Also in this package
Other skills from vinvcn/mattpocock-skills-zh-cn · top by installs.
npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn
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
4.0K
License
LICENSE
Default branch
main
Open issues
1
Status
Active
History
- First seen on skills.sh
- First recorded snapshot · 3,050 installs