resolve-backport-conflicts — Claude Code skill: what it does
Resolves merge conflicts in Mergify backport pull requests. It cleans up conflict markers and discards unrelated changes after cherry-pick failures.
npx skills add frappe/skills --skill resolve-backport-conflicts -a claude-codeWhat resolve-backport-conflicts does
When Mergify fails to cherry-pick a pull request into another branch, it commits unresolved files with conflict markers intact. This skill takes the pull request link or number and checks out the branch using the GitHub CLI. It inspects the local working tree first. If uncommitted changes exist, the execution halts immediately to protect existing work.
The agent reads the original pull request diff to understand the intended change. It applies that diff cleanly on top of the release branch code while dropping unrelated hunks. That prevents accidental leaks of newer APIs into stable versions. If code relies on a missing helper, the skill will not invent code on its own and asks how to proceed.
Once verified with diff checks and existing linters, changes are committed and pushed without a force flag. The skill then clears the conflict label from the pull request on GitHub.
What it helps with
- resolve conflict markers left by automated Mergify cherry-picks
- filter out unrelated changes dragged from newer commits
- match backported modifications against the original pull request diff
- clear the conflicts label from GitHub once markers disappear
Example prompts for the agent
- Resolve backport conflicts in pull request
<pr-url> - Fix Mergify conflict markers for pull request
<pr-url> - Check
<pr-url>and clean up unresolved backport hunks
How to install resolve-backport-conflicts
1Skills CLI (Vercel)
npx skills add frappe/skills --skill resolve-backport-conflicts -a claude-code2Manually: put the files in place
~/.claude/skills/resolve-backport-conflicts/SKILL.mdCopy the whole skill folder; for one project use .claude/skills/resolve-backport-conflicts/
1Skills CLI (Vercel)
npx skills add frappe/skills --skill resolve-backport-conflicts -a codex2Manually: put the files in place
.agents/skills/resolve-backport-conflicts/SKILL.mdFor all projects use ~/.agents/skills/
1Skills CLI (Vercel)
npx skills add frappe/skills --skill resolve-backport-conflicts -a cursor2Manually: put the files in place
.cursor/skills/resolve-backport-conflicts/SKILL.mdCursor also reads .agents/skills/ and .claude/skills/
1GitHub CLI
gh skill install frappe/skills resolve-backport-conflicts2Manually: put the files in place
.github/skills/resolve-backport-conflicts/SKILL.md1Skills CLI (Vercel)
npx skills add frappe/skills --skill resolve-backport-conflicts -a gemini-cli2Platform CLI
gemini skills install https://github.com/frappe/skills --path skills/resolve-backport-conflictsManually: put the files in place
.devin/skills/resolve-backport-conflicts/SKILL.mdThe legacy .windsurf/skills/ path still works
Skills CLI (Vercel)
npx skills add frappe/skills --skill resolve-backport-conflicts -a opencodeClaude.ai
Zip the folder and upload it in Settings → Capabilities → Skills
Step by step, with commands for each platform: How to install skills in Claude Code: five ways
Questions about resolve-backport-conflicts
How to install resolve-backport-conflicts in Claude Code?
Run npx skills add frappe/skills --skill resolve-backport-conflicts -a claude-code in your terminal.
What does resolve-backport-conflicts do?
It finds unresolved conflict markers after a failed Mergify backport, reconciles lines with the original pull request diff, and discards unrelated changes before committing.
What happens if the target branch lacks a required function?
The skill will not write a replacement on its own. It reports the missing dependency and asks the user how to proceed.
