skills.rest
thachrocky12345
thachrocky12345COMMUNITY
Explore all skills by this author →
GitHub

sibling-pr-merge

Merges sibling pull request branches into one consolidated integration branch and PR.

Updated May 11, 2026
Search Tags:#git#pull request#github#merge#conflict resolution#github cli#branch consolidation
One-click install
npx skills add https://github.com/thachrocky12345/local-agent-train-workstation --skill sibling-pr-merge-thachrocky12345
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: sibling-pr-merge
Source: https://github.com/thachrocky12345/local-agent-train-workstation/tree/main/.claude/skills/sibling-pr-merge
Command: npx skills add https://github.com/thachrocky12345/local-agent-train-workstation --skill sibling-pr-merge-thachrocky12345

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? When multiple feature branches each have their own pull request targeting the same base branch, reviewing and merging them one by one is slow and hides integration conflicts. This Skill consolidates all sibling branches into a single local integration branch with merge commits, opens one consolidated PR, and closes the individual PRs. ## Core Features & Use Cases - Consolidated Integration Branch: Merges N sibling branches into one <topic>-master branch using git merge --no-ff, preserving full history. - Guided Conflict Resolution: Provides a rule table for resolving common conflicts, such as keeping the superset of function edits, merging add/add file conflicts, and preferring IntegrityError-safe database writes. - PR Lifecycle Automation: Uses the GitHub CLI (gh) to discover sibling PRs, create the consolidated PR with a structured body, and close the superseded individual PRs with a comment. - Use Case: Tickets RGDEV-183 through RGDEV-186 each have open PRs against the same base branch. Run this Skill to merge all four into one attribution-master branch, open a single reviewable PR showing the full integrated diff, and close the four original PRs. ## Quick Start Merge the sibling branches RGDEV-183, RGDEV-184, RGDEV-185, and RGDEV-186 targeting the base branch RGDEV-205/checkout-flow-final into one consolidated PR.

Frequently Asked Questions about sibling-pr-merge

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I merge multiple pull requests into one PR on GitHub?▼

Create a local integration branch from the shared base branch, merge each sibling branch with git merge --no-ff in dependency order, then push and open one consolidated PR with gh pr create. Close the individual PRs with a comment pointing to the new PR.

How do I find all open PRs targeting the same base branch?▼

Use the GitHub CLI: gh pr list --json number,title,headRefName,baseRefName and filter with --jq on the baseRefName field. This lists every sibling PR whose head branch targets your chosen base branch.

How should I resolve git merge conflicts between sibling feature branches?▼

Keep the superset when one branch adds more checks or error handling to the same function, merge both sides of add/add file conflicts while deduplicating imports, and always prefer versions that catch IntegrityError on database writes. Verify no conflict markers remain with grep before committing.

In what order should sibling branches be merged?▼

Determine order by checking each branch's changed files with git diff --name-only and identifying dependencies, such as a branch that calls a function another branch adds. When no dependencies exist, merge in ascending ticket number order.

When should I not consolidate sibling PRs into one branch?▼

Avoid consolidation when branches are unrelated, when reviewers need isolated diffs per ticket, or when one branch is not ready to merge. Consolidation works best for tightly coupled tickets that must ship together.

Related Skills

Explore More Software Engineering Skills→
Gorillaa-ai-orgGorillaa-ai-org

pr-submit

Create and submit GitHub pull requests from the current branch.

Official
Advanced
fallow-rsfallow-rs
4.4k

review

Reviews branches, pull requests, and diffs against Fallow's pre-merge quality gates.

Official
Intermediate
robertpellonirobertpelloni
2

finishing-a-development-branch

Validate tests and execute merge, PR, or cleanup workflows for Git branches.

Community
Intermediate
mckissingermckissinger
1

land-feature

Coordinate GitHub pull request landing workflows to safely merge verified features into the main branch.

Community
Advanced