From odin
Merges multiple PRs into a base branch with queue-like sequencing and intelligent conflict resolution. Reports success, conflict details, or blockers for each PR.
How this skill is triggered — by the user, by Claude, or both
Slash command
/odin:pr-merge-baseThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
Merge one or more PRs into the base branch (main/master) using queue-like sequencing.
Merge one or more PRs into the base branch (main/master) using queue-like sequencing.
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:
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:
difft and codebase context.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:
git checkout <base> && git branch -D merge-queue/<timestamp> — base remains untouched at checkpoint.Report for each PR: merged successfully, conflicts resolved (with details), or blocked (with reason).
npx claudepluginhub outlinedriven/odin-claude-plugin --plugin odinMerges multiple PRs into a temporal integration branch for staged validation before advancing the base branch, with ordered conflict resolution and build/test checks.
Discovers open batch PRs from CHANGE_RECORD.json files, analyzes conflicts, determines optimal merge order, and executes user-guided merges on GitHub or Bitbucket.
Resolves Git merge conflicts in pull requests by merging JSON/YAML configs (e.g., higher versions) and Markdown. Use for PR-base conflicts, rebasing issues, or failed automated merges.