resolve-pr-conflict

resolve-pr-conflict is a skill for Claude Code, Codex from HLND2T/CS2_VibeSignatures. It costs 96 tokens per session (3,175 once invoked), scanned A, original, MIT.

A procedure for resolving conflicts in an open GitHub pull request within the CS2VibeSignatures repository. A pull request is a proposed set of changes, and a merge combines its target branch into its working branch.

In plain words
What is it for?
Use it for a supported same-repository pull request when the development branch needs the latest changes from its target branch before the pull request is merged.
Why use it?
It preserves both lines of development while handling conflicts in configuration and generated game-symbol files under defined safety rules.

Skill for Claude CodeCodex

Written for Claude Code and Codex: disable-model-invocation in frontmatter, but also agents/openai.yaml present. Also seen: mentions Codex.

Good fit Use it for a supported same-repository pull request when the development branch needs the latest changes from its target branch before the pull request is merged.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/hlnd2t/cs2_vibesignatures/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 HLND2T/CS2_VibeSignatures --skill resolve-pr-conflict
Clone the repo
git clone --depth 1 https://github.com/HLND2T/CS2_VibeSignatures

Made for: Claude Code, Codex.

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/hlnd2t/cs2_vibesignatures/resolve-pr-conflict/github.svg)](https://agentmods.dev/skills/hlnd2t/cs2_vibesignatures/resolve-pr-conflict)
Your own site
<a href="https://agentmods.dev/skills/hlnd2t/cs2_vibesignatures/resolve-pr-conflict"><img src="https://agentmods.dev/badge/skills/hlnd2t/cs2_vibesignatures/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/hlnd2t/cs2_vibesignatures/resolve-pr-conflict"><img src="https://agentmods.dev/badge/skills/hlnd2t/cs2_vibesignatures/resolve-pr-conflict.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 96 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,175 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. Third-party audits
  • NVIDIA SkillSpector pass 7 Sept 2026
How audits are shown
Origin original 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.00096 $0.03175
Opus 5.5 $0.00038 $0.01270
Sonnet 5.5 $0.00019 $0.00635
Haiku 4.5 $0.00010 $0.00317

Measured 11d ago against content hash ea81c992a01c, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, 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 11d 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.

.claude/skills/resolve-pr-conflict/SKILL.md · 251 lines

How it starts

The opening of the file, as written. The whole thing — 251 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Resolve PR Conflict

Resolve one PR through a validated, pushed merge commit. bin_artifacts/<GAMEVER>/ is the only tracked per-symbol truth; snapshots, gamedata, metadata, and release manifests are Release-derived and must not appear in the result.

Inputs and scope

  • pr — PR number or URL. If omitted, resolve the single open PR associated with the current branch.
  • gamever — optional expected GAMEVER. Infer only when the changed ownership is unambiguous.
  • remote — default origin.

Support only an open same-repository PR whose non-default head branch is writable through remote. Stop for a fork, detached head, missing remote, moving head, or ambiguous affected GAMEVER/producer ownership.

Hard safety rules

  • Start with a clean tracked worktree and index. Preserve unrelated untracked files.
  • Never rebase, amend, reset, force-push, delete branches, commit to the default branch, or use git add ./git add -A.
  • Merge only in this direction: PR head branch <- remote/<base> using --no-ff.
  • Never resolve source-owned artifact bytes by blindly choosing ours/theirs or hand-editing YAML formatting. Base bytes may seed an isolated rebuild, but final conflict bytes must come from the merged producer/config contract and central finalizer.
  • Reject tracked gamesymbols/**, gamedata/**, release-manifests/**, and bin/**/*.yaml in the final PR diff.
  • Treat s2sdk as a pin to the reviewed SDK, not release-derived output. Code changes and an s2sdk gitlink change in the same PR are almost always unrelated: a code merge can silently carry the gitlink backwards to an ancestor SDK. Keep a gitlink change only when the user confirms it as intentional.
  • Stop on a conflict in trusted planner/policy/required-workflow/publisher code unless the intended trust-root change is independently specified and reviewable; do not let the PR choose its own validation boundary.
  • Do not run a publisher, create Release outputs, or use publication credentials.
  • After push, report checks once and stop. Never merge or enable auto-merge.

Read the full file on GitHub · 251 lines

Files

What ships with it

3 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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. 11d ago Changed ea81c992a01c
  2. 16d ago Changed · -2 tokens per session 2207d113c844
  3. 26d ago Changed · +52 lines · +14 tokens per session 04a714f705ec
  4. 1mo ago Changed · +5 lines 07da84d77030
  5. 2mo ago Changed · -102 lines · -121 tokens per session c794cc655e04
  6. 2mo ago First seen · 296 lines · 205 tokens per session scan A ddb7829c7bfc

Subscribe to this mod's changes

resolve-pr-conflict is a skill published in the GitHub repository HLND2T/CS2_VibeSignatures (67 stars, last pushed today), licensed MIT. It adds 96 tokens to every session and 3,175 once invoked, about $0.0004 per session on Opus 5.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

resolve-pr-conflict compared with skills from other repositories

resolve-pr-conflict next to 6 skills from other repositories
ModTypeStarsLast pushLicenceScanTokensWorks with
resolve-pr-conflictHLND2T/CS2_VibeSignaturesSkill67todayMITA96Claude Code, Codex
merge-batchdiegosouzapw/OmniRouteSkill83k5d agoMITA46Claude Code
prowler-commitprowler-cloud/prowlerSkill15kyesterdayApache-2.0A44Claude Code, Codex
gh-auth-isolationgithub/gh-awSkill5.6kyesterdayMITA20Claude Code, Codex
github-skillzeenie-ai/OpenCompanySkill1.1kyesterdayMITA51Claude Code
comet-githubrpamis/cometSkill3.3kyesterdayMITA72Claude Code, Codex
release-helperSahir619/fable-methodSkill2.3k1mo agoMITA43Claude Code