resolving-merge-conflicts
适用于需要解决正在进行的 git merge/rebase 冲突时。
How do I install this agent skill?
npx skills add https://github.com/vinvcn/mattpocock-skills-zh-cn --skill resolving-merge-conflictsIs this agent skill safe to install?
- Gen Agent Trust Hubpass
This skill provides procedural instructions for resolving git merge and rebase conflicts. It follows standard development practices by analyzing commit history, pull requests, and issues, and verifying fixes with existing project tests.
- Socketpass
No alerts
- Snykpass
Risk: LOW · No issues
What does this agent skill do?
-
查看当前 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 都完成。
How can the creator link this skill?
Add the canonical catalog link to the repository README so users can inspect current installs and available audits. The publishing guide covers the complete discovery path.
<a href="https://skillzs.dev/skills/vinvcn/mattpocock-skills-zh-cn/resolving-merge-conflicts">View resolving-merge-conflicts on skillZs</a>