- Installs
- 3.5K
- Last 24h
- —
- Trending rank
- —
- Security
- Not audited
Install
Works with every agent the skills CLI supports.
npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflicts- 01
Install
Run the command in your project. The CLI asks which agents to install for.
- 02
Describe the task
Ask your agent for something this skill covers. It loads resolving-merge-conflicts automatically when relevant.
- 03
Review the result
The agent follows the SKILL.md steps, scripts and references bundled with the skill.
SKILL.md
The instructions your agent reads when the skill is triggered.
-
查看当前 merge/rebase 状态。检查 git history 和冲突文件。
-
为每个冲突找到 primary sources。深入理解每个变更为什么产生，以及原始意图是什么。阅读 commit messages，检查 PRs，检查原始 issues/tickets。
-
解决每个 hunk。 尽可能保留双方意图。若二者不兼容，选择符合本次 merge 目标的一方，并记录 trade-off。不要发明新行为。始终解决冲突；不要
--abort。 -
发现项目的 automated checks 并运行它们，通常是 typecheck、tests、format。修复 merge 引入的问题。
-
完成 merge/rebase。 Stage 所有内容并 commit。若正在 rebase，继续 rebase 流程直到所有 commits 都完成。
FAQ
What does the resolving-merge-conflicts skill do?
适用于需要解决正在进行的 git merge/rebase 冲突时。
How do I install resolving-merge-conflicts?
Run npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflicts in your project. The skills CLI detects the agents you use and copies the skill into the right folder. For Claude Code you can also place the skill folder at ~/.claude/skills/resolving-merge-conflicts/ (personal) or .claude/skills/resolving-merge-conflicts/ (project).
Which AI agents can use resolving-merge-conflicts?
Any agent that supports the open Agent Skills format (a folder with a SKILL.md file), including Claude Code, Codex, Cursor, GitHub Copilot, Gemini CLI, Windsurf, Cline, OpenCode and more.
Is resolving-merge-conflicts safe to install?
No partner security audit is available yet. Skills can run commands and scripts, so read the SKILL.md and any bundled files before installing.
Who maintains resolving-merge-conflicts?
It is published by vinvcn in vinvcn/mattpocock-skills-zh-cn. It has 3,534 recorded installs.
More from vinvcn/mattpocock-skills-zh-cn
grill-with-docs
vinvcn/mattpocock-skills-zh-cn
一个用来打磨计划或设计的持续追问式访谈，并在过程中创建文档（ADRs 和词汇表）。
setup-matt-pocock-skills
vinvcn/mattpocock-skills-zh-cn
为此仓库配置 engineering skills：设置其 issue tracker、triage labels 词汇与 domain docs 布局。在首次使用其他 engineering skills 前运行一次。
tdd
vinvcn/mattpocock-skills-zh-cn
测试驱动开发。适用于用户想用先写测试的方式构建功能或修复缺陷、提到 “red-green-refactor”，或需要集成测试时。
improve-codebase-architecture
vinvcn/mattpocock-skills-zh-cn
扫描代码库中的深化机会，生成可视化 HTML 报告，然后围绕你选中的候选项继续追问。
Popular code quality & workflow skills
grill-me
mattpocock/skills
A relentless interview to sharpen a plan or design.
improve-codebase-architecture
mattpocock/skills
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
handoff
mattpocock/skills
Compact the current conversation into a handoff document for another agent to pick up.
domain-modeling
mattpocock/skills
Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a GLOSSARY.md, or recording or editing an ADR.
codebase-design
mattpocock/skills
Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary.
diagnosing-bugs
mattpocock/skills
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.