Step 1: Find the Files with Conflicts
SkillDev toolsResolve git merge, rebase, or cherry-pick conflicts and finalize the operation
Available today. Use it from your connected AI after setup.
No other account needed.
Connect ahel once, and every AI you use reads what you have installed.
Then ask your AI: use the Step 1: Find the Files with Conflicts skill
What this skill tells your AI
The instructions your AI receives, as published by causify-ai/helpers in .claude/skills/git.merge_conflicts/SKILL.md and read by ahel’s review.
- Find the files with conflicts running
> git diff --name-only --diff-filter=U
Step 2: Propose Fixes
-
For each file with conflict:
- Explain why the conflict happened
- Propose what needs to be done
-
If you are not sure on what to do, give priority to the branch change
-
Example
1. tutorials/GitHub_Stats/Master_GitHub_analysis.py - Issue: Jupytext version conflict. - Resolution: Use master, it's the newer version. 2. tutorials/GitHub_Stats/docker_jupyter.sh - Issue: HEAD adds -e GITHUB_ACCESS_TOKEN to Docker env; master removes it. - Resolution: Use master (remove the line)
Step 3
- Ask user which changes should be done
- Perform the changes
- Resolve the git conflict
Signals
- GitHub stars
- 145
- Forks
- 159
- Last commit
- Sep 2026
Advanced
- Catalog kind
- skill
- Gateway key
git-merge-conflicts- Source
- github.com/causify-ai/helpers