Skill

pr-merge-base

Merges multiple PRs into base branch sequentially with dependency ordering, intelligent conflict resolution, temporary integration branch, and build validation before final update.

Git

Github

devops

automation

Install

npx claudepluginhub outlinedriven/odin-claude-plugin --plugin odin

Tool Access

This skill uses the workspace's default tool permissions.

Preview

Merge one or more PRs into the base branch (main/master) using queue-like sequencing.

SKILL.md

Similar Skills

using-git-worktrees

Creates isolated Git worktrees for feature branches with prioritized directory selection, gitignore safety checks, auto project setup for Node/Python/Rust/Go, and baseline verification.

superpowers

169.2k

subagent-driven-development

3 files

Executes implementation plans in current session by dispatching fresh subagents per independent task, with two-stage reviews: spec compliance then code quality.

superpowers

169.2k

dispatching-parallel-agents

Dispatches parallel agents to independently tackle 2+ tasks like separate test failures or subsystems without shared state or dependencies.

superpowers

169.2k

Stats

Stars24

Forks0

Last CommitMar 7, 2026

Actions

View Source View Plugin View on GitHub View README

Tags

Smart Merge to Base Branch

Merge one or more PRs into the base branch (main/master) using queue-like sequencing.

Process

Detect base branch: Identify the default branch (main, master, or repo-specific) via git remote show origin or repo conventions.

Enumerate PRs: List all PRs to merge. For each, fetch the latest HEAD.

Create checkpoint: Record the current base branch tip as a rollback point.

CHECKPOINT=$(git rev-parse HEAD)

Create integration branch: Work on a temporary branch to validate before touching base.

git checkout -b merge-queue/<timestamp> <base>

Determine merge order:

If the user specifies an order, use that.
Otherwise, compute dependency/topological order (if PR B depends on PR A, merge A first).
If PRs are independent with no clear ordering, present the list and ask the user to confirm or reorder before proceeding.

Sequential merge with conflict handling — for each PR in order: a. Attempt git merge --no-ff <pr-branch> into the integration branch. b. If merge succeeds cleanly, continue to next PR. c. If conflicts occur:

Analyze each conflict file using difft and codebase context.
Apply resolution using structural understanding (prefer base for formatting, PR for logic).
If a conflict cannot be resolved with confidence, abort this merge (git merge --abort), stop and report the conflict to the user with both sides and a recommended resolution. d. After each successful merge, verify the build still passes (if build commands are available).

Validate integration branch: Once all PRs are merged on the integration branch, run full build/test suite if available.

Report results: Present the validated integration branch to the user. Do NOT advance the base branch automatically — only update base if the user explicitly requests it.

Abort conditions — stop the queue and report if:

A conflict cannot be safely auto-resolved.
A post-merge build/test fails.
A PR has been superseded or closed. Roll back: git checkout <base> && git branch -D merge-queue/<timestamp> — base remains untouched at checkpoint.

Output

Report for each PR: merged successfully, conflicts resolved (with details), or blocked (with reason).

Smart Merge to Base Branch

Merge one or more PRs into the base branch (main/master) using queue-like sequencing.

Process

Detect base branch: Identify the default branch (main, master, or repo-specific) via git remote show origin or repo conventions.

Enumerate PRs: List all PRs to merge. For each, fetch the latest HEAD.

Create checkpoint: Record the current base branch tip as a rollback point.

CHECKPOINT=$(git rev-parse HEAD)

Create integration branch: Work on a temporary branch to validate before touching base.

git checkout -b merge-queue/<timestamp> <base>

Determine merge order:

If the user specifies an order, use that.
Otherwise, compute dependency/topological order (if PR B depends on PR A, merge A first).
If PRs are independent with no clear ordering, present the list and ask the user to confirm or reorder before proceeding.

Analyze each conflict file using difft and codebase context.
Apply resolution using structural understanding (prefer base for formatting, PR for logic).
If a conflict cannot be resolved with confidence, abort this merge (git merge --abort), stop and report the conflict to the user with both sides and a recommended resolution. d. After each successful merge, verify the build still passes (if build commands are available).

Validate integration branch: Once all PRs are merged on the integration branch, run full build/test suite if available.

Report results: Present the validated integration branch to the user. Do NOT advance the base branch automatically — only update base if the user explicitly requests it.

Abort conditions — stop the queue and report if:

A conflict cannot be safely auto-resolved.
A post-merge build/test fails.
A PR has been superseded or closed. Roll back: git checkout <base> && git branch -D merge-queue/<timestamp> — base remains untouched at checkpoint.

Output

Report for each PR: merged successfully, conflicts resolved (with details), or blocked (with reason).