majiayu000

Rebase PR — Git skill for Claude Code

Git community

Use when: rebasing a PR branch onto main and the rebase produces conflicts.

How to install Rebase PR

Installs to ~/.claude/skills/majiayu000-harness-rebase-pr/SKILL.md

Terminal
mkdir -p ~/.claude/skills/majiayu000-harness-rebase-pr && curl -fsSL https://raw.githubusercontent.com/majiayu000/harness/HEAD/skills/rebase-pr.md -o ~/.claude/skills/majiayu000-harness-rebase-pr/SKILL.md

Restart Claude Code, or start a new session, for it to be picked up.

What Rebase PR does

Use when: rebasing a PR branch onto main and the rebase produces conflicts. Triggers on: rebase origin/main, rebase the PR, rebase --continue, rebase --skip, rebase conflict, conflicting and rebase, manual resolution required, rebase the conflicting

Trigger

Use when a `git rebase` against the base branch

Alternatives in Git

  • Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
  • OSS PR — Commit + PR workflow for open source contributions: auto-creates a user-prefixed branch when on main/master, t 19.7k ★
  • Triage Open Pull Requests — Review, label, and act on all open PRs for a repository using parallel review agents 10.8k ★

Full documentation available on GitHub

View Source Repository

Related Skills

Rebase On Main — Git skill for Claude Code

Rebase On Main

Rebase the current branch on origin/main and resolve any conflicts.

Git community
Git Rebase — Git skill for Claude Code

Git Rebase

Rebases onto origin/main (or origin/master) and resolves conflicts

Git community
Resolve Conflict — Git skill for Claude Code

Resolve Conflict

You are resolving git merge/rebase conflicts. Follow this procedure, and briefly tell the user what you're doi

Git community
Safe Pull — Git skill for Claude Code

Safe Pull

安全地從 origin/main 拉取最新內容到本機，自動 stash 本地未 commit 的修改，rebase 完成後再還原

Git community
Rebase Master — Git skill for Claude Code

Rebase Master

Fetch origin/master and rebase the current branch onto it

Git community
Conflict Resolver — Git skill for Claude Code

Conflict Resolver

Resolve merge conflicts on develop branch

Git community

Related Agents

Git Reconciler — Development agent for Claude Code

Git Reconciler

Git branch reconciliation specialist using git and the gh CLI. Use whenever there are merge conflicts, a diver

Development community
Gitnexus Branch Hygiene Reviewer — Development agent for Claude Code

Gitnexus Branch Hygiene Reviewer

GitNexus branch hygiene and mergeability reviewer. Use to classify merge state, conflicts, stale branches, mer

Development community
Worker Conflict Resolver — Development agent for Claude Code

Worker Conflict Resolver

Given a set of PR numbers with mutual merge conflicts (or conflicts against main), produce a unified resolutio

Development community