resolving-merge-conflicts
SkillDev toolsGuides your agent through resolving merge conflicts step by step during an in-progress git merge or rebase.
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
Use when you need to resolve conflicts during an in-progress git merge/rebase.
What this skill tells your AI
The instructions your AI receives, as published by devcxl/mattpocock-skills-zh in skills/engineering/resolving-merge-conflicts/SKILL.md and read by ahel’s review.
-
查看当前状态——merge/rebase 处于什么状态。检查 git 历史与冲突文件。
-
找到每一处冲突的主要来源。深入理解每次变更背后的原因和原始意图。阅读 commit 信息、查看 PR、查看原始 issue/ticket。
-
逐个解决冲突块（hunk）。尽可能同时保留双方的意图。若不兼容，选择与 merge 公开目标一致的一方，并记录权衡。不要发明新行为。始终要解决，永远不要
--abort。 -
找出项目的自动化检查并运行——通常是 typecheck，然后是 tests，最后是 format。修复 merge 破坏的任何东西。
-
完成 merge/rebase。把所有改动 stage 并 commit。若是 rebase，就继续推进，直到所有 commit 都 rebase 完。
Signals
- GitHub stars
- 406
- Forks
- 33
- Last commit
- Sep 2026
Advanced
- Item type
- skill
- Key
resolving-merge-conflicts-devcxl- Source
- github.com/devcxl/mattpocock-skills-zh