tools-p4-resolve

tools-p4-resolve is a skill for Claude Code from tjboudreaux/cc-plugin-perforce. It costs 27 tokens per session (2,379 once invoked), scanned A, original, MIT.

A guide to resolving Perforce conflicts. Perforce is a centralized version-control system, and a conflict occurs when local and submitted changes cannot be combined automatically.

In plain words
What is it for?
Use it to preview unresolved files, merge text changes, choose between competing versions, handle file attributes and deletes, and resolve conflicts before submitting changes.
Why use it?
It explains how to compare your workspace, the depot version, and their shared starting version before choosing the correct result. It also covers conflicts involving deleted, moved, changed, or binary files.

Skill for Claude Code

Written for Claude Code: shipped in a Claude Code plugin.

Part of the perforce plugin — 4 skills shipped together

Good fit Use it to preview unresolved files, merge text changes, choose between competing versions, handle file attributes and deletes, and resolve conflicts before submitting changes.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve
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 tjboudreaux/cc-plugin-perforce --skill tools-p4-resolve
Clone the repo
git clone --depth 1 https://github.com/tjboudreaux/cc-plugin-perforce

Made for: Claude Code.

Or install perforce, the plugin that ships this one along with the rest of its 4 skills.

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 tools-p4-resolve

README.md
[![agentmods](https://agentmods.dev/badge/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve/github.svg)](https://agentmods.dev/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve)
Your own site
<a href="https://agentmods.dev/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve"><img src="https://agentmods.dev/badge/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve/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 tools-p4-resolve

Your own site · 80×15
<a href="https://agentmods.dev/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve"><img src="https://agentmods.dev/badge/skills/tjboudreaux/cc-plugin-perforce/tools-p4-resolve.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 27 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 2,379 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 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.00027 $0.02379
Opus 5 $0.00014 $0.01189
Sonnet 5 $0.00005 $0.00476
Haiku 4.5 $0.00003 $0.00238

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

Security

Grade A, and why

tools-p4-resolve 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 9d 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.

skills/tools-p4-resolve/SKILL.md · 458 lines

How it starts

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

Perforce Conflict Resolution

Overview

Conflicts occur when multiple users modify the same file. Perforce provides powerful resolve tools for merging changes. This skill covers all resolve strategies and workflows.

When to Use

  • After syncing when files have conflicts
  • Before submitting changes
  • When integrating between branches
  • Handling binary file conflicts
  • Resolving content vs attribute conflicts

Core Concepts

Conflict Types

Type Description Resolution
Content Both versions modified same lines Merge or choose version
Attribute File type or permissions changed Choose attribute
Delete File deleted in one version, modified in other Keep or delete
Move/Delete File moved and deleted Choose action
Binary Binary file modified by both Choose version (no merge)

Three-Way Merge

Base (common ancestor)
    |
    +-- Theirs (depot/source)
    |
    +-- Yours (workspace)
    |
    v
Merged Result

Basic Resolve

Check for Conflicts

# Preview resolve (see what needs resolving)
p4 resolve -n

# See files that need resolving
p4 resolve -n //depot/project/...

# Check specific file
p4 resolve -n file.txt

Automatic Resolve

# Auto-resolve all (safe merge where possible)
p4 resolve -am

# Auto-resolve accepting merge result
p4 resolve -am //depot/project/...

# Auto-resolve specific file
p4 resolve -am file.txt

Resolve Strategies

# Accept automatic merge (only if no conflicts)
p4 resolve -am

# Accept theirs (depot version)
p4 resolve -at

# Accept yours (workspace version)
p4 resolve -ay

# Force accept theirs even with conflicts
p4 resolve -at //...

# Force accept yours even with conflicts
p4 resolve -ay //...

Interactive Resolve

Launch Interactive Resolve

# Interactive resolve for all files
p4 resolve

# Interactive resolve for specific file
p4 resolve file.txt

# Interactive with specific merge tool
p4 resolve -t p4merge file.txt

Read the full file on GitHub · 458 lines

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. 9d ago First seen · 458 lines · 27 tokens per session scan A 6212c1557285

Subscribe to this mod's changes

tools-p4-resolve is a skill published in the GitHub repository tjboudreaux/cc-plugin-perforce (8 stars, last pushed 7mo ago), licensed MIT. It adds 27 tokens to every session and 2,379 once invoked, about $0.0001 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-31.

Related

Other skills, from other repositories

agent-merge-conflict-arbiter

Neutral arbiter for merge conflicts between two agents.

NousResearch/hermes-agent · 19 tokens

git-advanced-workflows

Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.

wshobson/agents · 54 tokens

bisect

Bisect regressions or broken builds in the Chromium repository using deterministic binary search, checking out midpoint commits, syncing dependencies with gclient sync, compiling the target with autoninja, and querying the user for test results until the culprit commit is isolated.

chromium/chromium · 52 tokens

mantis-critic

Assesses the production viability of findings, filtering out debug-only features and assertion traps. Use when findings have been validated and you need to confirm they are triggerable in production release builds (with assertions disabled). Don't use for writing reproduction scripts or patches.

google/mantis · 55 tokens

hotpath_bump

Bump the hotpath version number across the workspace and related files. Updates crate versions in Cargo.toml files (exact patch version) and version references in the backend middleware, hotpathinit skill, and README (major.minor only). Use when the user wants to bump, bump the version, or release a new hotpath…

pawurb/hotpath-rs · 73 tokens

comet-github-issue-fix

A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.

rpamis/comet · 71 tokens