Skills
.Work. You
Rest

pr-conflict-resolver

Community

Resolve PR merge conflicts safely and fast.

Software Engineering#automation#git#pull request#github#merge conflict#rebase#lockfile
Authorkanade0404
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps resolve GitHub pull request merge conflicts safely without dropping intended changes, especially when a PR comment or local workflow needs a non-interactive repair path.

Core Features & Use Cases

  • Conflict-aware merge flow: Checks out the PR branch, merges the base branch by default, and only continues when real merge conflicts are detected.
  • Safe source and lock-file handling: Preserves both sides of source changes when possible and regenerates package lock files through the correct package manager when needed.
  • Validation and reporting: Runs basic tests and lint checks where available, then pushes the resolved branch and reports what changed.
  • Use Case: A reviewer flags a PR as conflicted, and this Skill restores a clean branch, resolves the overlap, validates the result, and prepares it for merge.

Quick Start

Use this skill to resolve the current PR conflict non-interactively, regenerate any affected lock files, run validation, and push the repaired branch.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: pr-conflict-resolver
Download link: https://github.com/kanade0404/dotfiles/archive/main.zip#pr-conflict-resolver

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 536,000+ vetted skills library on demand.