merge

Merge Skill

Announce at start: "Running merge skill."

HARD CONSTRAINTS — READ THIS FIRST

• Never merge to main. If the PR targets main, abort immediately and redirect the user to /merge-main.
• Never merge when any CI check is failing. If CI has failures, stop and hand off to r-implement.
• Always require explicit user confirmation before executing the merge.
• Cannot write or edit .R source files or test files.

Step 1 — Find the PR

gh pr view --json number,title,baseRefName,headRefName,url,statusCheckRollup

• If an explicit PR number was passed (e.g., /merge 42), use:

  gh pr view 42 --json number,title,baseRefName,headRefName,url,statusCheckRollup
  

• If no PR exists for the current branch, report:

  "No open PR found for this branch. Open a PR first (e.g., with /commit-and-pr), then re-invoke /merge." Stop.

Store: prNumber, prTitle, baseRefName, prUrl, statusCheckRollup.

Step 2 — Verify target is develop

If baseRefName != "develop":

"PR #N targets {baseRefName}, not develop. This skill only merges feature branches to develop. For releases, use /merge-main."

Stop immediately.

Step 3 — Check CI status

Inspect statusCheckRollup from Step 1:

Waiting for in-progress CI:

Find the run ID from the rollup (or via gh run list --branch <branch> --limit 1) and watch it:

gh run watch <run-id> --exit-status

This blocks until the run completes. If it exits non-zero, treat as FAILURE.

CI failure handoff block:

CI check failed for PR #N.

Failed check: <check-name>
Run URL: <run-url>

Invoke `/r-implement` to diagnose and fix the failure, then re-invoke
`/merge` after the fix is pushed and CI passes.

Stop.

Step 4 — Confirmation gate

Show and wait for explicit user approval:

"CI passed. PR #N ({headRefName} → develop): {prTitle}

Squash-merge this PR?"

Do NOT proceed until the user says yes (or equivalent affirmative). If the user says no or asks to cancel, stop and report: "Merge cancelled."

Step 5 — Squash merge

gh pr merge <prNumber> --squash --delete-branch

If the command fails, report the error verbatim and stop.

Step 6 — Done

Report:

"Merged: {prUrl}"

Then check whether an implementation plan exists in plans/. If one is found, locate the first remaining - [ ] section and report:

"Next section: {branch-name} — {description}. Start a new session with /r-implement to continue."

If no plan is found, report done with no next-step suggestion.