Skip to content
Agentmart
Submit a tool

resolve-backport-conflicts

Resolve merge conflicts in a Mergify backport pull request.

Skill by frappe

IndexedLicense unknown★ 156
Write a review

Install

Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.

npx agentmarket install skill/frappe-resolve-backport-conflicts

Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.

Get the weekly diff

The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.

We use your email only for this newsletter. Privacy

About

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.

Reviews

Write a review

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.

Tools
No tools found
Secrets
None asked for
Install scripts
None found

Network hosts it talks to 1

  • codeload.github.com · found in install command

Files it touches

  • ~/.claude/skills/resolve-backport-conflicts

What's inside

Skill name
resolve-backport-conflicts
Description
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.
License
unknown
Instructions
106 lines in SKILL.md · view on GitHub

Files (1)

  • SKILL.md

The license isn't open source, so the instructions aren't shown here. Read SKILL.md on GitHub

More from frappe/skills

Signals

Stars
156
Forks
54
Open issues
6
Last commit (this folder)
Aug 12, 2026 (2 months ago)

From GitHub (fetched Oct 24, 2026).

Details

License
License unknown
Repository
github.com/frappe/skills
First seen
Oct 24, 2026
Last checked
Oct 24, 2026
Source
GitHubgithub-graphql

More from frappe

Cite this page

resolve-backport-conflicts skill. Agent Mart. https://agentmart.dev/skills/frappe-resolve-backport-conflicts (last updated 2026-10-24)