Rebase a PR branch onto its verified base and resolve conflicts by intent.
npx skills add https://github.com/pnewsam/skills --skill rebase-pr-pnewsam
Please help me install this Agent Skill. Skill: rebase-pr Source: https://github.com/pnewsam/skills/tree/main/registry/rebase-pr Command: npx skills add https://github.com/pnewsam/skills --skill rebase-pr-pnewsam
--force-with-lease tied to the observed remote head. - Post-rebase validation: Re-runs affected checks, inspects the net diff for duplication and semantic conflicts, and verifies base ancestry and PR state. - Use Case: A teammate's PR was merged while your feature branch was open. Use this Skill to rebase onto the new base, reconcile overlapping changes already upstream, validate the result, and update the PR with a lease-protected push. ## Quick Start Use the rebase-pr skill to rebase my current PR branch onto the latest main, resolve conflicts, and update the pull request.High-intent search queries and answers about installing and using this skill.
Fetch the verified base branch, record the pre-rebase head, create a recovery ref, then rebase onto that base and resolve each conflict from the work's intent. Validate the resulting candidate with the established checks before publishing.
Use an explicit lease tied to the remote head observed before rewriting: --force-with-lease=refs/heads/BRANCH:EXPECTED_SHA. Never use bare force, and if the remote moved, stop and reconcile that work instead of refreshing the lease.
A rebase rewrites commit history, which can invalidate existing approvals depending on repository settings. The Skill explains approval invalidation when it is material and not already accepted, and never posts reviews or merges automatically.
Compare both histories and identify commits whose effects are already upstream. Keep one owner for overlapping implementations, migrate callers and resources, and account for each commit as retained, superseded, or intentionally retired.
Yes. Preview mode inspects the branch, base, and overlapping changes and proposes a resolution without rewriting history. Only an explicit rebase request authorizes the local rewrite and conflict resolution.
DaRipper91Suggest relevant GitHub Copilot instruction files from the awesome-copilot repository.
richkuoAutomate GitHub issue implementation, pull request creation, and review feedback resolution.
FabienDehopreResolve in-progress Git merge and rebase conflicts by analyzing changes and completing integration.
Knuckles-TeamAutomate Git history fixes using rebase, cherry-pick, and bisect workflows.