适用于需要解决正在进行的 git merge/rebase 冲突时。
Install
The individual skill folder is not confirmed. This command opens the repository’s skill selector; follow the upstream instructions.
skills CLI
npx skills add vinvcn/mattpocock-skills-zh-CNResolving Merge Conflicts
vinvcn
Related
More- RResolving Merge ConflictsmattpocockUse when you need to resolve an in-progress git merge/rebase conflict.Software Development300.4k Repository stars
- CClaude APIAnthropicOfficialGives Claude current reference material, SDK docs and best practices for the Claude API and Managed Agents in eight languages; bundled with Claude Code.Software Development182.9k Repository stars
- BMCP BuilderAnthropicOfficialGuide for building MCP (Model Context Protocol) servers that connect LLMs to external APIs, using Python FastMCP or the Node/TypeScript MCP SDK.Software Development182.9k Repository stars
- WWeb Artifacts BuilderAnthropicOfficialTools for building multi-component claude.ai HTML artifacts with React, Tailwind CSS and shadcn/ui when state management or routing is needed.Software Development182.9k Repository stars
- WWebapp TestingAnthropicOfficialPlaywright-based toolkit for testing local web apps: verify frontend behavior, debug UI issues, capture browser screenshots and read browser logs.Software Development182.9k Repository stars
- SSuperpowersobra (Jesse Vincent, Prime Radiant)CollectionSoftware development methodology built on composable skills: the agent clarifies the spec, writes a plan, then executes with TDD and subagent-driven development.Software Development15 skills303.4k Repository stars