Skills
.Work. You
Rest

gh:pr-resolve-conflict

Community

Resolve PR conflicts with safe rebase flow

Software Engineering#automation#git#workflow#safety#rebase#pr#conflicts
AuthordEitY719
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Conflicts on pull requests require a safe and deterministic rebase flow to keep history clean and avoid accidental merges; this skill guides you through automatic rebasing, per-file conflict resolution prompts, and a guarded push with --force-with-lease.

Core Features & Use Cases

  • PR conflict resolution via rebase: auto-detects the target PR, fetches the base, rebases onto origin/<base>, and guides per-file resolutions.
  • Safety and guardrails: prints a backup SHA, auto-stashes dirty worktrees, and refuses to operate on the default branch or without explicit confirmation when needed.
  • Workflow applicability: ideal for teams enforcing a rebase-only policy; use when PRs report conflicts after base updates; ensures final push uses --force-with-lease and validates PR status via gh pr view.

Quick Start

Run the command on your PR branch to automatically rebase onto the target base, resolve conflicts with guided prompts, and push with --force-with-lease when ready.

Dependency Matrix

Required Modules

None required

Components

references

💻 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: gh:pr-resolve-conflict
Download link: https://github.com/dEitY719/dotfiles/archive/main.zip#gh-pr-resolve-conflict

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 471,000+ vetted skills library on demand.