Back to skills
SkillHub ClubShip Full StackFull StackIntegration

pr-merge-temporal

Merge multiple PRs into a temporal integration branch before merging to base, with ordered conflict resolution. Use when you want to validate a set of PRs together on a staging branch before advancing the base branch.

Packaged view

This page reorganizes the original catalog entry around fit, installability, and workflow context first. The original raw source lives below.

Stars
17
Hot score
87
Updated
March 20, 2026
Overall rating
C1.7
Composite score
1.7
Best-practice grade
A92.0

Install command

npx @skill-hub/cli install outlinedriven-odin-claude-plugin-pr-merge-temporal

Repository

OutlineDriven/odin-claude-plugin

Skill path: skills/pr-merge-temporal

Merge multiple PRs into a temporal integration branch before merging to base, with ordered conflict resolution. Use when you want to validate a set of PRs together on a staging branch before advancing the base branch.

Open repository

Best for

Primary workflow: Ship Full Stack.

Technical facets: Full Stack, Integration.

Target audience: everyone.

License: Unknown.

Original source

Catalog source: SkillHub Club.

Repository owner: OutlineDriven.

This is still a mirrored public skill entry. Review the repository before installing into production workflows.

What it helps with

  • Install pr-merge-temporal into Claude Code, Codex CLI, Gemini CLI, or OpenCode workflows
  • Review https://github.com/OutlineDriven/odin-claude-plugin before adding pr-merge-temporal to shared team environments
  • Use pr-merge-temporal for development workflows

Works across

Claude CodeCodex CLIGemini CLIOpenCode

Favorites: 0.

Sub-skills: 0.

Aggregator: No.

Original source / Raw SKILL.md

---
name: pr-merge-temporal
description: Merge multiple PRs into a temporal integration branch before merging to base, with ordered conflict resolution. Use when you want to validate a set of PRs together on a staging branch before advancing the base branch.
---
# Smart Merge to Temporal Branch

Merge multiple PRs into a temporal integration branch for validation before merging to base.

## Process

1. **Detect base branch**: Identify the default branch via `git remote show origin` or repo conventions.

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

3. **Create temporal branch**: Fetch latest and branch from the remote base tip.
   ```
   git fetch origin
   git checkout -b temporal/<timestamp> origin/<base>
   ```

4. **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.

5. **Sequential merge with conflict handling** — for each PR in order:
   a. Attempt `git merge --no-ff <pr-branch>` into the temporal branch.
   b. If merge succeeds cleanly, continue to next PR.
   c. If conflicts occur:
      - Analyze each conflict 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 (`git merge --abort`), stop, and report the conflict with both sides and a recommended resolution.
   d. After each successful merge, run available build/test commands to catch regressions early.

6. **Validate temporal branch**: Once all PRs are merged, run full build/test suite if available.

7. **Report results**: Present the validated temporal branch to the user. Do NOT merge into base automatically — only advance base if the user explicitly requests it.

8. **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.
   The temporal branch is abandoned: `git checkout <base>` — base remains untouched.

## Output

Report for each PR: merged successfully, conflicts resolved (with details), or blocked (with reason). Include the temporal branch name for user review.
pr-merge-temporal | SkillHub