一键在 Manus 中运行任何 Skill

开始使用

merge-pr

星标3

分支1

更新时间2026年2月8日 11:14

Merges a PR with automatic cleanup of worktree and branch. Handles all edge cases. Use when merging approved PRs.

安装

用 Codex 或 Claude 帮你安装复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。

在 Manus 中运行

来源

ncukondo

ncukondo/reference-manager

打开 GitHub 仓库查看创作者相关仓库

下载

在 Manus 中运行

Merge PR #$ARGUMENTS

PR #$ARGUMENTS のマージ処理を行います。

PR Status

!gh pr view $ARGUMENTS --json headRefName,state,mergeable,reviewDecision --jq '"Branch: \(.headRefName)\nState: \(.state)\nMergeable: \(.mergeable)\nReview: \(.reviewDecision)"' 2>/dev/null

CI Status

!gh pr checks $ARGUMENTS 2>/dev/null

Worktree Status

!git worktree list

One-Command Merge

Recommended: Use the merge script that handles all edge cases:

./scripts/merge-pr.sh $ARGUMENTS

This script automatically:

Waits for CI if still running
Merges the PR (squash by default)
Switches to main if currently in worktree
Kills any agents running in the worktree
Removes the worktree (force if locked)
Deletes local and remote branches
Moves task file to completed (if found)

Options

# Squash merge (default)
./scripts/merge-pr.sh $ARGUMENTS --squash

# Regular merge commit
./scripts/merge-pr.sh $ARGUMENTS --merge

# Rebase merge
./scripts/merge-pr.sh $ARGUMENTS --rebase

# Skip task file management
./scripts/merge-pr.sh $ARGUMENTS --no-task

# Preview what would happen
./scripts/merge-pr.sh $ARGUMENTS --dry-run

Batch Merge

For multiple PRs, run sequentially:

./scripts/merge-pr.sh 123
./scripts/merge-pr.sh 124
./scripts/merge-pr.sh 125

Or parallel (if no conflicts expected):

./scripts/merge-pr.sh 123 &
./scripts/merge-pr.sh 124 &
./scripts/merge-pr.sh 125 &
wait

Post-Merge Tasks

After merge, update ROADMAP if needed:

Open spec/tasks/ROADMAP.md
Change task status to "Done"
Commit: git add spec/tasks/ROADMAP.md && git commit -m "chore(tasks): complete task X"
Push: git push

Troubleshooting

"Worktree locked"

The script handles this with --force, but if it still fails:

PARENT_DIR="$(cd "$(git rev-parse --show-toplevel)/.." && pwd)"
rm -rf "${PARENT_DIR}/reference-manager--worktrees/<branch-dir>"
git worktree prune

"Branch not fully merged"

Use -D (force delete):

git branch -D <branch-name>

"Cannot delete current branch"

You're still in the worktree. Switch first:

cd "$(git rev-parse --show-toplevel)"
git checkout main

Agent still running in worktree

Kill it first:

./scripts/kill-agent.sh <pane-id>

同仓库更多 Skills

同仓库

ref

ncukondo/reference-manager

Manage academic references in CSL-JSON format. Add papers by DOI/PMID/ISBN/arXiv, search and list references, generate citations, manage full-text PDFs, and check for retractions.

2026-03-263

implement

ncukondo/reference-manager

Analyzes ROADMAP and implements tasks in parallel with automatic orchestration. Use when starting implementation work.

2026-02-173

review-pr

ncukondo/reference-manager

Reviews a GitHub PR by checking CI status, running tests, and posting review. Always reports findings to user. Use when reviewing PRs or when the user says "review PR".

2026-02-113

cleanup-roadmap

ncukondo/reference-manager

Cleans up completed phases in ROADMAP, moving relevant info to CHANGELOG or specs.

2026-02-083

code-with-task-local

ncukondo/reference-manager

Implements a task locally (without worktree) following TDD with IPC status reporting. Use when working on a task in an existing branch.

2026-02-083

code-with-task

ncukondo/reference-manager

Implements a task from spec/tasks in a git worktree following TDD. Use when working on a specific task by keyword.

2026-02-083

name	merge-pr
description	Merges a PR with automatic cleanup of worktree and branch. Handles all edge cases. Use when merging approved PRs.

Merge PR #$ARGUMENTS

PR #$ARGUMENTS のマージ処理を行います。

PR Status

!gh pr view $ARGUMENTS --json headRefName,state,mergeable,reviewDecision --jq '"Branch: \(.headRefName)\nState: \(.state)\nMergeable: \(.mergeable)\nReview: \(.reviewDecision)"' 2>/dev/null

CI Status

!gh pr checks $ARGUMENTS 2>/dev/null

Worktree Status

!git worktree list

One-Command Merge

Recommended: Use the merge script that handles all edge cases:

./scripts/merge-pr.sh $ARGUMENTS

This script automatically:

Waits for CI if still running
Merges the PR (squash by default)
Switches to main if currently in worktree
Kills any agents running in the worktree
Removes the worktree (force if locked)
Deletes local and remote branches
Moves task file to completed (if found)

Options

# Squash merge (default)
./scripts/merge-pr.sh $ARGUMENTS --squash

# Regular merge commit
./scripts/merge-pr.sh $ARGUMENTS --merge

# Rebase merge
./scripts/merge-pr.sh $ARGUMENTS --rebase

# Skip task file management
./scripts/merge-pr.sh $ARGUMENTS --no-task

# Preview what would happen
./scripts/merge-pr.sh $ARGUMENTS --dry-run

Batch Merge

For multiple PRs, run sequentially:

./scripts/merge-pr.sh 123
./scripts/merge-pr.sh 124
./scripts/merge-pr.sh 125

Or parallel (if no conflicts expected):

./scripts/merge-pr.sh 123 &
./scripts/merge-pr.sh 124 &
./scripts/merge-pr.sh 125 &
wait

Post-Merge Tasks

After merge, update ROADMAP if needed:

Open spec/tasks/ROADMAP.md
Change task status to "Done"
Commit: git add spec/tasks/ROADMAP.md && git commit -m "chore(tasks): complete task X"
Push: git push

Troubleshooting

"Worktree locked"

The script handles this with --force, but if it still fails:

PARENT_DIR="$(cd "$(git rev-parse --show-toplevel)/.." && pwd)"
rm -rf "${PARENT_DIR}/reference-manager--worktrees/<branch-dir>"
git worktree prune

"Branch not fully merged"

Use -D (force delete):

git branch -D <branch-name>

"Cannot delete current branch"

You're still in the worktree. Switch first:

cd "$(git rev-parse --show-toplevel)"
git checkout main

Agent still running in worktree

Kill it first:

./scripts/kill-agent.sh <pane-id>