What happens if the two changes cannot both be kept?

The skill picks the change that matches the merge's stated goal and notes the trade-off. It does not invent new behaviour.

Can the agent abort the merge instead of resolving it?

No. The skill always resolves conflicts and never uses --abort.

What automated checks does it run?

It discovers the project's checks and typically runs typecheck, then tests, then format, fixing anything the merge broke.

Does it work for rebases as well as merges?

Yes. It handles both in-progress merges and rebases, continuing the rebase until all commits are rebased.

resolving-merge-conflicts

SkillDev tools

The resolving-merge-conflicts skill guides an AI agent through an in-progress git merge or rebase conflict. It inspects the repository state, reads commit messages, pull requests, and tickets to understand why each change was made, then resolves every conflicting hunk while preserving both intents where possible. After resolving, it runs the project's automated checks and finishes the merge or rebase.

Use resolving-merge-conflicts in Claude, ChatGPT or Ahel Desktop

Free. Sign in, add resolving-merge-conflicts and connect your AI. About a minute.

Claude ChatGPT Ahel Desktop

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.

Have an in-progress git merge or rebase with conflicts in your repository.

resolving-merge-conflictsStart free

What your AI can do with it

Inspect git history and conflicting files to see the current merge or rebase state
Read commit messages, PRs, and tickets to understand each change's intent
Resolve each conflicting hunk, preserving both intents where possible
Run the project's automated checks such as typecheck, tests, and format
Stage and commit to finish the merge or continue the rebase

Getting started

Have an in-progress git merge or rebase with conflicts in your repository.
Make the skill available to your AI agent.
Start the agent on the conflicted repository and let it inspect the state.
Review the resolutions it makes and the automated checks it runs.
Confirm the final commit or rebase continuation.

What this skill tells your AI

The instructions your AI receives, as published by mattpocock/skills in skills/engineering/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: 273k
Forks: 23k
Last commit: Sep 2026
Installs: 551k installs

Others that do the same job

resolving-merge-conflicts
Skill · brim-borium resolving-merge-conflicts
Skill · shangjin-xiao resolving-merge-conflicts
Skill · nauelg resolving-merge-conflicts
Skill · dimon94 resolving-merge-conflicts
Skill · vodailocz resolving-merge-conflicts
Skill · asymmetric-al

Questions

What happens if the two changes cannot both be kept?: The skill picks the change that matches the merge's stated goal and notes the trade-off. It does not invent new behaviour.
Can the agent abort the merge instead of resolving it?: No. The skill always resolves conflicts and never uses --abort.
What automated checks does it run?: It discovers the project's checks and typically runs typecheck, then tests, then format, fixing anything the merge broke.
Does it work for rebases as well as merges?: Yes. It handles both in-progress merges and rebases, continuing the rebase until all commits are rebased.

Advanced

Item type: skill
Key: resolving-merge-conflicts-mattpocock
Source: github.com/mattpocock/skills

github.com/mattpocock/skills