Can this skill help with binary file conflicts?

Yes, it provides specific workflows for binary conflicts where automated merging isn't possible, helping you choose between the depot version or your local workspace version.

Does it support external merge tools?

Yes, the skill includes instructions for configuring P4MERGE to work with visual tools like P4Merge, Meld, or Visual Studio Code for manual resolution.

How does Claude handle automatic merges in Perforce?

The skill utilizes the 'p4 resolve -am' command to automatically merge changes that do not overlap, significantly speeding up the sync process.

What is the tools-p4-resolve skill?

It is a specialized capability for Claude Code that provides commands, patterns, and best practices for resolving file conflicts in Perforce version control.

Can I use this for branch integration?

Absolutely. The skill includes advanced resolve patterns specifically designed for handling conflicts that occur during 'p4 integrate' operations between branches.

Perforce Conflict Resolution

Name: Perforce Conflict Resolution
Author: tjboudreaux

bytjboudreaux

•

Developer Tools

Manages Perforce version control conflicts using automated merge strategies, 3-way merges, and interactive resolution workflows.

The tools-p4-resolve skill empowers Claude to navigate complex Perforce conflict scenarios, from simple text merges to tricky binary and attribute conflicts. It provides a structured approach to conflict resolution by offering previews, automated safe merges, and detailed guidance for interactive 3-way merges. Whether you are integrating branches, syncing a busy workspace, or handling move/delete conflicts, this skill ensures that version control operations are performed safely and correctly to maintain codebase integrity.

Key Features

01Automated conflict detection and previewing with p4 resolve -n

02Interactive 3-way merge workflows for resolving complex code overlaps

033 GitHub stars

04Support for all standard resolve strategies including accept theirs, accept yours, and auto-merge

05Specialized handling for binary file conflicts and file attribute changes

06Configuration guidance for external visual merge tools like P4Merge and VS Code

Use Cases

01Managing branch integration conflicts during large-scale code merges

02Cleaning up manual merge markers and verifying code stability before submission

03Resolving content conflicts after syncing latest changes from a busy depot

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add tjboudreaux/cc-plugin-perforce tools-p4-resolve

For use in Claude.ai and ChatGPT

Download Skill