resolving-merge-conflicts
SkillDev toolsHelps your agent resolve git merge and rebase conflicts while they are happening.
Use resolving-merge-conflicts in Claude, ChatGPT or Ahel Desktop
Free. Sign in, add resolving-merge-conflicts and connect your AI. About a minute.
Also: Claude Code · Cursor · Codex
Then ask your AI: use the resolving-merge-conflicts skill
Details
Instructions available. Your AI can read the instructions. Execution depends on the setup they require.
Account requirements not reviewed. Check the skill instructions before use; ahel provides instructions and does not run this skill.
No other account needed.
Add ahel to your AI once: Claude, ChatGPT, Cursor, Claude Code or Codex. Then ask it to use this.
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
- 5k
- Forks
- 369
- Last commit
- Sep 2026
Advanced
- Item type
- skill
- Key
resolving-merge-conflicts-vinvcn- Source
- github.com/vinvcn/mattpocock-skills-zh-cn
github.com/vinvcn/mattpocock-skills-zh-cn