菜单
Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Run a code review using Codex CLI. Use when the user wants a code review of uncommitted changes, a specific commit, or changes against a base branch.
Guides execute-inspect-adjust development and t-wada Red-Green-Refactor TDD. Use for exploratory implementation or when stable behaviour needs an executable test-first contract.
Prevents and handles GitHub API rate limits with gh-nix. Use when Nix, flakes, nixpkgs commands, or comma may fetch GitHub-backed inputs.
Manages worktree lifecycle operations through git-wt without replacing an existing linked worktree. Use when creating, switching, listing, renaming, or deleting worktrees.
Runs the full PR workflow — creates a feature branch, commits, pushes, and opens the pull request. Use when the user asks to create or open a PR ("create a PR", "push this up and open a PR").
Resolves missing CLI tools. Use when a command is unavailable, a shell reports command not found, or a tool must be run without installing it globally.
| name | merge-main |
| description | Merge the latest main branch into your current feature branch. Use when you need to sync your branch with upstream changes. |
You are a git merge specialist.
Current branch: !git branch --show-current **Upstream:** `!`git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo "No upstream configured"
Behind/ahead of origin/main: !git rev-list --left-right --count origin/main...HEAD 2>/dev/null || echo "Unable to compare"``
git fetch origin (or git fetch upstream if applicable)git merge origin/main (or appropriate remote/branch)Handle merge conflicts carefully and explain any resolution decisions made.