メニュー
Work with repositories using the git-flow-next branching model (default branch is `develop`, production branch is `main`). Covers branch creation, worktree setup, atomic commits, PR targeting, validation on `develop`, and mandatory end-of-session promotion to `main`.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| name | git-flow-next |
| description | Work with repositories using the git-flow-next branching model (default branch is `develop`, production branch is `main`). Covers branch creation, worktree setup, atomic commits, PR targeting, validation on `develop`, and mandatory end-of-session promotion to `main`. |
Use this skill when working on repositories configured for the Git Flow branching model.
Before any branch, PR, or release work, check the repo's remote default branch:
gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
develop -> Follow this skill.main -> Use trunk flow (squash-to-main directly). Do NOT follow this skill.| Branch | Role | Gets changes by |
|---|---|---|
main | Production. Protected; no direct pushes. | Merge commits only — squash and rebase are banned. |
develop | Default integration branch. Protected; no direct pushes. | Squash-merged feature PRs (default); merge commits for back-merges. |
feature/<issue>-<sid8>-<slug> | Topic work | Branched from fresh develop. |
release/<version> | Release stabilization | Branched from develop; merge-committed to main; back-merged to develop. |
hotfix/<slug> | Production fix | Branched from main; PR to main (merge commit); back-merged to develop. |
All feature development happens in dedicated worktrees. Branch names carry the
session id: <issue>-<sid8>-<slug>, where <sid8> is the first 8 hex chars of
the session/conversation id (generate openssl rand -hex 4 if the runtime has
none). Issueless work drops the issue segment: <sid8>-<slug>. The worktree
directory matches the branch's name segment. Unique-per-session names make
worktree/branch collisions between concurrent sessions structurally
impossible; refs dryvist/ai-assistant-instructions#749.
To prevent wrong nesting:
Resolve the destination path using an absolute anchor and create the branch directly in the worktree:
name="123-03a3a401-fix-inventory-loader"
git worktree add -b "feature/$name" \
"$(dirname "$(git rev-parse --git-common-dir)")/.worktrees/$name" origin/develop
The primary/root checkout remains on develop. Never check out feature branches at the root.
One session, one branch: never commit to or push another session's
branch. A takeover continues on a NEW branch (fresh <sid8>), never by
reusing the prior session's name.
Navigate to the newly created worktree directory:
cd "$(dirname "$(git rev-parse --git-common-dir)")/.worktrees/123-03a3a401-fix-inventory-loader"
Note: The branch feature/123-03a3a401-fix-inventory-loader is already created and checked out by the worktree setup step.
Commit atomically following Conventional Commits, referencing the issue (#123).
Open the PR targeting develop — every change to develop goes through a
PR; the ruleset rejects direct pushes (GH013). Squash-merge feature PRs
with gh pr merge <PR_NUMBER> --squash --auto: a bare --squash is rejected with
"the base branch policy prohibits the merge" while checks settle, and
--auto merges as soon as the policy is satisfied.
Validation: Thoroughly test and validate the merged code on develop before production promotion.
"Promotion is a step you take, not an event that happens."
Feature PRs squash into develop and stop there. To release them:
Before finishing a session, fetch the latest remote state and verify if develop has unpromoted commits:
git fetch origin --force develop main && git log origin/main..origin/develop
If commits exist, run /promote-release to open/reuse a develop -> main PR and merge it using a merge commit (--merge flag on gh pr merge).
Never squash or rebase into main.
Merging triggers release-please on main, which automatically cuts the release, version bump, and tag.
Planning Reminder: You must add "Merge develop into main" to your session checklist/to-do list at planning time.
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.