resolving-merge-conflicts
SkillDev toolsUse when you need to resolve an in-progress git merge/rebase conflict.
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.
What this skill tells your AI
The instructions your AI receives, as published by nauelg/astro-blocks in .agents/skills/resolving-merge-conflicts/SKILL.md and read by ahel’s review.
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Signals
- GitHub stars
- 29
- Forks
- 2
- Last commit
- Sep 2026
ahel recommends instead
Advanced
- Item type
- skill
- Key
resolving-merge-conflicts-nauelg- Source
- github.com/nauelg/astro-blocks
github.com/nauelg/astro-blocks