メニュー
Use when managing branches, resolving merge conflicts, syncing with the default branch, or working with worktrees. Covers both trunk repos (main) and git-flow repos (develop) — see gh-cli-patterns (github-workflows) for default-branch detection.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Use when creating PRs, linking issues, managing PR comments, or creating GitHub issues
Use when creating or editing GitHub Actions workflows that call reusable workflows (uses: OWNER/repo/.github/workflows/...) — org owner references must be the literal current org, and shared-CI homes are under dryvist.
Emit a paste-ready two-part handoff for a fresh session: a `## Goal statement` hard-capped under 4000 characters (measured with wc -c, never estimated) that pastes straight into Claude Code's /goal Stop hook, plus an unbounded `## Full prompt` carrying cwd, ordered reading list, hard rules, pitfalls, and deliverables. Use when forking work to a new session, spinning up an orchestrator, or when wrap-up needs a next-session prompt with a real goal and not just a task list.
Analyzes current session state and repository status without any cleanup. Full mode (default): resolves the active plan file, reads plan checklist + TaskList, gathers unfinished work/issues from conversation history, checks git status, and emits a /handoff-built next-session prompt. Mid-session mode (`/session-status mid`): a fast plain-language 'done vs remaining' snapshot for mid-flight orientation, skipping the history scan, triage, and handoff.
End-of-session handler that first checks whether the current session's plan is actually complete. If complete: refresh repo, run quick retrospective, clean gone branches, and emit a forward-looking follow-up prompt. If incomplete: skip cleanup and emit one or more `cd`-into-worktree blocks paired with ready-to-paste resume prompts so the unfinished work can be picked up cold in a new session.
Automatically finalize pull requests for merge by resolving CodeQL violations, review threads, merge conflicts, and CI failures. Handles single PR (current branch or by number), all open PRs in the repo, or all open PRs across the org. Includes bot-authored PRs in all modes.
| name | git-workflow-standards |
| description | Use when managing branches, resolving merge conflicts, syncing with the default branch, or working with worktrees. Covers both trunk repos (main) and git-flow repos (develop) — see gh-cli-patterns (github-workflows) for default-branch detection. |
All development uses dedicated worktrees. Never work directly on the default
branch — main on a trunk repo, develop on a git-flow repo.
Create a worktree for the change; remove it when the work is done.
Every branch with commits MUST have an associated PR. Orphaned branches must get a PR or be deleted.
Stale worktree: A branch with no open PR, no uncommitted changes, and either a merged PR
whose headRefOid matches local HEAD, or a deleted remote ([gone]) with no commits ahead
of the default branch (git log origin/<default>..HEAD --oneline is empty). Branches with open
PRs, local-only branches without merged PRs, local commits beyond the merged PR head, and
worktrees with uncommitted changes are NEVER stale. Use git worktree remove (never --force)
— Git natively blocks removal of dirty worktrees.
git pullgit flow feature start branches from develop)pr-standards)For repositories using the Git Flow model (where the default branch is develop):
develop.develop, they must be thoroughly validated against production/tested on develop.develop MUST be merged into main via /promote-release.
This promotion is a mandatory, non-optional step.| Method | When |
|---|---|
git merge origin/<default> | Default — preserves history, safer |
git rebase origin/<default> | Only if branch has NOT been pushed yet |
Sync workflow (replace <default> with the repo's actual default branch — see
gh-cli-patterns, github-workflows):
git fetch origin <default> && git pull origin <default> # in the <default> worktree
git merge origin/<default> --no-edit # in the feature worktree
NEVER assume newer is correct. Analyze both versions.
git log --oneline -10 -- <file>pre-commit run --files <file>, read resolved file| Scenario | Resolution |
|---|---|
| Additive changes | Keep both |
| Same logic modified | Combine intent of both |
| One is a bug fix | Always include the fix |
| One is a refactor | Apply refactor, then add other change |
| Truly incompatible | Prefer branch's changes, add comment |
Escalate to human review for complex business logic, fundamental contradictions, or security-sensitive code.
| Command | Purpose |
|---|---|
git diff --name-only --diff-filter=U | List conflicted files |
git log --merge -p <file> | Show commits causing conflict |
git show :1:<file> | Common ancestor version |
git show :2:<file> | HEAD (your branch) version |
git show :3:<file> | Incoming (their branch) version |
git merge --abort | Abort and return to pre-merge state |