New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Resolve Backport Conflicts

by frappe in frappe/skills

Resolve merge conflicts in a Mergify backport pull request. An agent skill from frappe/skills.

No licenceAuto-check passedDevelopment

Install Resolve Backport Conflicts

skills CLI
$ npx skills add frappe/skills --skill resolve-backport-conflicts -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install frappe/skills resolve-backport-conflicts --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/frappe/skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/resolve-backport-conflicts .claude/skills/resolve-backport-conflicts && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
resolve-backport-conflicts
GitHub stars
147
Token cost
~1.1k tokens
SKILL.md length
585 words
Files
1
Skills in repo
8
Repo updated
First seen
Licence
None found

At a glance

Resolve merge conflicts in a Mergify backport pull request. An agent skill from frappe/skills.

  • Works in 8 steps: Check out the pull request → Read the original pull request → Find every marker → …
  • Tasks that involve Pull requests
  • SKILL.md covers How Mergify leaves the branch and Steps
  • Calls git and gh

What it does

Resolve Backport Conflicts is an agent skill from frappe/skills. Resolve merge conflicts in a Mergify backport pull request. When a cherry-pick fails, Mergify commits the conflict markers as they are. This skill takes a pull request link or number as an argument.

Its SKILL.md is about 1.1k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Pull requests and Git workflow. The repository describes itself as: Agent skills for Frappe App development.

When your agent uses it

  • Tasks that involve Pull requests
  • Tasks that involve Git workflow

Example prompts

  • “/resolve-backport-conflicts”

Workflow steps

8 steps, taken from the step headings in SKILL.md.

  1. Check out the pull request
  2. Read the original pull request
  3. Find every marker
  4. Resolve each conflict
  5. Verify
  6. Commit and push
  7. Remove the conflicts label
  8. Summarize

What it can do on your machine

Read from SKILL.md and the folder at commit 0bef982. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git
    • gh

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git and gh, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Resolve Backport Conflicts loads about 1.1k tokens when it runs. Until then it costs about 56 tokens; SKILL.md has 585 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~56
When it runs · the whole SKILL.md, loaded when a task matches
~1.1k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

Without a licence we can't republish the file, so here is its outline and opening line. It has 585 words (~1,105 tokens).

“Mergify backports a pull request with a cherry-pick. When the cherry-pick conflicts, Mergify runs git add on the conflicted files and commits them unresolved. The branch then holds raw conflict markers:”

— opening of SKILL.md by frappe
name
resolve-backport-conflicts
disable-model-invocation
true

Read the full SKILL.md on GitHub

Files

Just SKILL.md in skills/resolve-backport-conflicts of frappe/skills.

Open the folder on GitHubat commit 0bef982

Compare with similar skills

Resolve Backport Conflicts next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Resolve Backport Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolve Backport Conflicts this skillfrappe/skills147—~1.1kAutomated safety check: PassNone
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0
Git Branch Namingmakeplane/plane61k—~594Automated safety check: PassAGPL-3.0
Creating Description For Gh PRredis/jedis12k—~838Automated safety check: PassMIT

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Branch Naming

    makeplane/plane

    Names a new Git branch with a type prefix, the lowercased work item ID and a short kebab-case description, so the ID can be extracted later from the branch name.

    61k GitHub stars~594 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Creating Description For Gh PR

    redis/jedis

    Official

    Generate a clear, concise GitHub PR title and description from the diff between two local git branches, and save it to prDescription.md in the repo root.

    12k GitHub stars~838 tokensUpdated yesterday
    DevelopmentAuto-check passed

  • Create Pull Request with Work Item ID

    makeplane/plane

    Opens a pull request for the current branch using the repo's template, a work item ID in the title and a description filled in from the actual diff.

    61k GitHub stars~824 tokensUpdated yesterday
    DevelopmentAuto-check passed

More from frappe/skills

All 8 skills in this repo

  • Frappe App Dev

    frappe/skills

    Builds full-stack Frappe Framework applications end-to-end. An agent skill from frappe/skills.

    147 GitHub stars~943 tokensUpdated 9 days ago
    Auto-check passed

  • Deep App Audit

    frappe/skills

    Deep audit of a Frappe app for security, correctness, and customization defects.

    147 GitHub stars~5.4k tokensUpdated 9 days ago
    Auto-check passed

  • Draft Security Advisory

    frappe/skills

    Turn a vulnerability report into a publication-ready GitHub Security Advisory.

    147 GitHub stars~1.3k tokensUpdated 9 days ago
    Auto-check passed

  • Fix Issue

    frappe/skills

    Fix a bug reported in a GitHub issue or a markdown file, without letting the report's noise and guesses into the main context.

    147 GitHub stars~987 tokensUpdated 9 days ago
    Auto-check passed

  • Frappe Code Review

    frappe/skills

    Review code for any Frappe application — a checklist distilled from years of engineering practice on correctness, security, performance, concurrency, readability, API design, and testing.

    147 GitHub stars~3.8k tokensUpdated 9 days ago
    Auto-check passed

  • Technical Writing

    frappe/skills

    Write prose in "Simplified Technical English". An agent skill from frappe/skills.

    147 GitHub stars~1.1k tokensUpdated 9 days ago
    Auto-check passed

Categories

Questions about Resolve Backport Conflicts

What does Resolve Backport Conflicts do?

Resolve merge conflicts in a Mergify backport pull request. An agent skill from frappe/skills. Resolve Backport Conflicts is an agent skill from frappe/skills. Resolve merge conflicts in a Mergify backport pull request.

When should I use Resolve Backport Conflicts?

Resolve Backport Conflicts fits situations like: tasks that involve Pull requests; tasks that involve Git workflow.

How do I install Resolve Backport Conflicts in Claude Code?

Run `npx skills add frappe/skills --skill resolve-backport-conflicts -a claude-code`. Or copy the skill folder (skills/resolve-backport-conflicts in frappe/skills) into .claude/skills/resolve-backport-conflicts in your project. Claude Code loads it when a task matches its description.

How do I install Resolve Backport Conflicts in Codex?

Run `npx skills add frappe/skills --skill resolve-backport-conflicts -a codex`. Or copy the skill folder (skills/resolve-backport-conflicts in frappe/skills) into .agents/skills/resolve-backport-conflicts in your project. Codex loads it when a task matches its description.

Can I use Resolve Backport Conflicts in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add frappe/skills --skill resolve-backport-conflicts -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/resolve-backport-conflicts, .gemini/skills/resolve-backport-conflicts, .github/skills/resolve-backport-conflicts and .opencode/skills/resolve-backport-conflicts in your project.

What does Resolve Backport Conflicts need to run?

Going by SKILL.md and its folder, Resolve Backport Conflicts needs the command-line tools its instructions call (git and gh).

Does Resolve Backport Conflicts access the network?

SKILL.md contains no URLs. Its commands use git and gh, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Resolve Backport Conflicts safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Resolve Backport Conflicts use?

No licence was found for Resolve Backport Conflicts or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.

How many tokens does Resolve Backport Conflicts use?

About 1.1k tokens (SKILL.md is roughly 4.4k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Resolve Backport Conflicts?

Skills that share tags, products or a category with Resolve Backport Conflicts: Finishing a Development Branch (obra/superpowers, 297k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars), Create Pull Request (cline/cline, 70k stars) and Git Branch Naming (makeplane/plane, 61k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Resolve Backport Conflicts?

frappe (a GitHub organization) maintains it in frappe/skills, which has 147 GitHub stars. The repository holds 8 skills in this directory. The repository was last updated on September 30, 2026.

Source: frappe/skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.