resolving-merge-conflicts
SkillDev toolsGuides your agent through resolving merge conflicts by inspecting both sides' intent, fixing hunks, running tests, and completing the merge.
Available today. Use it from your connected AI after setup.
No other account needed.
Add ahel to your AI once: Claude, ChatGPT, Cursor, Claude Code or Codex. Then ask it to use this.
Then ask your AI: use the resolving-merge-conflicts skill
About this skill
适用于需要解决正在进行的 git merge/rebase 冲突时。
What this skill tells your AI
The instructions your AI receives, as published by vinvcn/mattpocock-skills-zh-cn in skills/engineering/resolving-merge-conflicts/SKILL.md and read by ahel’s review.
-
查看当前 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 都完成。
Signals
- GitHub stars
- 4k
- Forks
- 362
- Last commit
- Sep 2026
Advanced
- Item type
- skill
- Key
resolving-merge-conflicts-vinvcn- Source
- github.com/vinvcn/mattpocock-skills-zh-cn