rescue__pull_request_conflict

rescue__pull_request_conflict is a skill for Claude Code, Codex from shunsock/dotfiles. It costs 156 tokens per session (1,445 once invoked), scanned A, original, no licence file.

An automated procedure for resolving merge conflicts in a pull request branch. A merge conflict happens when Git cannot combine competing changes by itself.

In plain words
What is it for?
Use it to repair a pull request marked as conflicting, then pass control to a monitor for rechecking.
Why use it?
It combines the conflicting sides into one commit and pushes the result, removing the need to resolve the same conflict manually. The description is in Japanese and does not explain its conflict-selection rules.

Skill for Claude CodeCodex

Which agent this was written for is unclear — body not stored (licence); the path alone says nothing. Also seen: model in frontmatter.

Good fit Use it to repair a pull request marked as conflicting, then pass control to a monitor for rechecking.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/shunsock/dotfiles/rescue__pull_request_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 shunsock/dotfiles --skill rescue__pull_request_conflict
Clone the repo
git clone --depth 1 https://github.com/shunsock/dotfiles

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 rescue__pull_request_conflict

README.md
[![agentmods](https://agentmods.dev/badge/skills/shunsock/dotfiles/rescue__pull_request_conflict/github.svg)](https://agentmods.dev/skills/shunsock/dotfiles/rescue__pull_request_conflict)
Your own site
<a href="https://agentmods.dev/skills/shunsock/dotfiles/rescue__pull_request_conflict"><img src="https://agentmods.dev/badge/skills/shunsock/dotfiles/rescue__pull_request_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 rescue__pull_request_conflict

Your own site · 80×15
<a href="https://agentmods.dev/skills/shunsock/dotfiles/rescue__pull_request_conflict"><img src="https://agentmods.dev/badge/skills/shunsock/dotfiles/rescue__pull_request_conflict.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 156 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,445 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.00156 $0.01445
Opus 5.5 $0.00062 $0.00578
Sonnet 5.5 $0.00031 $0.00289
Haiku 4.5 $0.00016 $0.00145

Measured 1mo ago against content hash 2a069e2eb57b, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

rescue__pull_request_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 1mo 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.

configs/claude/skills/rescue__pull_request_conflict/SKILL.md · 122 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. 1mo ago First seen · 122 lines · 156 tokens per session scan A 2a069e2eb57b

Subscribe to this mod's changes

rescue__pull_request_conflict is a skill published in the GitHub repository shunsock/dotfiles (10 stars, last pushed 1mo ago), with no licence file. It adds 156 tokens to every session and 1,445 once invoked, about $0.0006 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-31.

Related

Other skills, from other repositories

github-issue-create

Create a GitHub issue with an auto-generated description. Use when the user asks to open an issue for a bug, feature request, or task.

aiya000/dotfiles · 35 tokens

inspect-why-windows-did-shutdown

Find out why Windows shut down or rebooted, by reading the Windows System event log from WSL via powershell.exe. Use when the user says Windows went down, restarted on its own, crashed, or asks whether it was a Windows Update or a bug.

aiya000/dotfiles · 63 tokens

write-tech-note

Write a Japanese technical article for Zenn or Qiita in aiya000's own writing style, learned from his past articles, with the target platform decided from the current directory. Use when the user asks to write, draft, or rewrite a tech article, blog post, or note, or invokes /write-tech-note.

aiya000/dotfiles · 69 tokens

show-issues-overview

Show a table-formatted overview of the current repository's issues, from GitHub Issues, GitLab Issues, or a TODO.md-like file when the project has neither. Use when the user asks what issues/tasks are open, wants to decide what to work on next, or invokes /show-issues-overview.

aiya000/dotfiles · 69 tokens

git-commit

Create a new git commit for staged changes. Use when the user asks to commit staged changes with an auto-generated Conventional Commits message, or when Claude Code itself wants to run git commit.

aiya000/dotfiles · 43 tokens

create-handoff

Save the session's durable half as a memory file (save-memory), then write the perishable half -- the handoff prompt for the next session -- to a well-known place in the /.ai-memory repository and push it, so the next session, local or in the cloud, can pick the work up with read-handoff or pop-handoff and nobody has…

aiya000/dotfiles · 134 tokens