resolve-pr-conflict

resolve-pr-conflict is a skill for Claude Code from getty104/claude-code-marketplace. It costs 66 tokens per session (3,598 once invoked), scanned A, original, no licence file.

A pull-request conflict checker and resolver for a specified target branch. A conflict happens when the PR's changes cannot be combined with newer changes in the target branch automatically.

In plain words
What is it for?
It checks for conflicts, rebases the PR branch when needed, and pushes the updated branch using force-with-lease.
Why use it?
It helps ensure a pull request can be merged with its target branch when conflicts exist.

Skill for Claude Code

Written for Claude Code: argument-hint in frontmatter.

Part of the base-tools plugin — 23 skills, 5 agents, 1 hook, 3 MCP servers shipped together

Good fit It checks for conflicts, rebases the PR branch when needed, and pushes the updated branch using force-with-lease.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/getty104/claude-code-marketplace/resolve-pr-conflict
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add getty104/claude-code-marketplace --skill resolve-pr-conflict
Clone the repo
git clone --depth 1 https://github.com/getty104/claude-code-marketplace

Made for: Claude Code.

Or install base-tools, the plugin that ships this one along with the rest of its 23 skills, 5 agents, 1 hook, 3 MCP servers.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for resolve-pr-conflict

README.md
[![agentmods](https://agentmods.dev/badge/skills/getty104/claude-code-marketplace/resolve-pr-conflict/github.svg)](https://agentmods.dev/skills/getty104/claude-code-marketplace/resolve-pr-conflict)
Your own site
<a href="https://agentmods.dev/skills/getty104/claude-code-marketplace/resolve-pr-conflict"><img src="https://agentmods.dev/badge/skills/getty104/claude-code-marketplace/resolve-pr-conflict/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for resolve-pr-conflict

Your own site · 80×15
<a href="https://agentmods.dev/skills/getty104/claude-code-marketplace/resolve-pr-conflict"><img src="https://agentmods.dev/badge/skills/getty104/claude-code-marketplace/resolve-pr-conflict.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 66 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,598 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin unknown No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00066 $0.03598
Opus 5 $0.00033 $0.01799
Sonnet 5 $0.00013 $0.00720
Haiku 4.5 $0.00007 $0.00360

Measured 10d ago against content hash 04694164933c, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-10, from the pricing page.

Security

Grade A, and why

resolve-pr-conflict scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 10d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

base-tools/skills/resolve-pr-conflict/SKILL.md · 169 lines

The source is not reproduced here

No licence file

A repository with no LICENSE is all rights reserved by default, so the body is not copied here. The metadata, the measurements and the link are.

Read it on GitHub

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 10d ago First seen · 169 lines · 66 tokens per session scan A 04694164933c

Subscribe to this mod's changes

resolve-pr-conflict is a skill published in the GitHub repository getty104/claude-code-marketplace (11 stars, last pushed 2mo ago), with no licence file. It adds 66 tokens to every session and 3,598 once invoked, about $0.0003 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

re0-merge

Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…

LilMGenius/paperthin · 70 tokens

nvca-chart-release

Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.

NVIDIA/nvcf · 61 tokens