Create Branch
Start every piece of work on its own correctly named branch, cut from an
up-to-date base. The branch name isn't cosmetic: the create-commit skill pulls
the JIRA ticket out of it for commit footers, PRs inherit it, and a consistent
<type>/<TICKET>-<slug> shape makes branches self-describing in a busy repo.
1. Find the JIRA ticket
The branch should carry the ticket ID (PUB-4204 style — any PROJ-123
pattern) whenever the work has one. Look for it in this order:
- The user's request or earlier conversation.
- Documents driving the work: a requirements doc under
docs/requirements/,
a plan under docs/plans/, a pasted ticket or spec.
- If none is found, ask the user for one — a one-line question is cheaper
than renaming a branch later. Branching without a ticket is fine when the
user confirms there isn't one; never invent an ID.
2. Name the branch
<type>/<TICKET-ID>-<short-slug> # feat/PUB-4204-site-creation
<type>/<short-slug> # fix/dropdown-focus-trap (no ticket)
<type> uses the same taxonomy as create-commit (feat, fix, chore,
docs, refactor, …) and describes the work about to happen.<short-slug> is kebab-case, 2–5 words, describing the change — not the
ticket title verbatim.- All lowercase — except the ticket ID, which keeps its canonical uppercase
form (
PUB-4204, never pub-4204; create-commit's footer extraction and
JIRA both expect it). No spaces, underscores, or trailing dashes.
3. Cut it from an up-to-date base
- Identify the base branch — the repo's default (
gh repo view --json defaultBranchRef -q .defaultBranchRef.name), unless the repo's convention
is to branch from develop; where recent PRs merge tells you
(gh pr list --limit 20 --json baseRefName).
- Check the name is free before creating anything:
git branch --list <name> and git ls-remote --heads origin <name>. If
it already exists, ask whether to switch to it instead — never reuse a
name for different work.
- Check the working tree (
git status). Uncommitted changes that belong to
the new work simply ride along to the new branch. Changes that belong to
other work should be surfaced to the user before switching — don't let
them silently migrate.
- Create from the fetched remote base, not the local copy:
git fetch origin <base> && git checkout -b <name> origin/<base>. A
git pull on the local base would merge any stray local commits sitting
there, and the new branch — and eventually its PR — would inherit them;
branching from origin/<base> sidesteps that entirely. If currently on
another feature branch, confirm with the user whether to stack on it
instead of branching from the base.
Report the created branch and its base. The natural next steps are the work
itself, then create-commit for each reviewed change, and raise-pr when
the branch is ready.
1---2name: create-branch3description: Create a correctly named git feature branch off an up-to-date base, carrying the JIRA ticket ID when one is in context. Use this skill whenever the user wants to "create a branch", "make a new branch", "branch off main", "start work on PUB-1234", "checkout a feature branch", or when work is about to begin (or a commit is about to land) while still on main/master. This is the first step of the delivery flow — branch, then commit with create-commit, then raise the PR with raise-pr.4---56# Create Branch78Start every piece of work on its own correctly named branch, cut from an9up-to-date base. The branch name isn't cosmetic: the create-commit skill pulls10the JIRA ticket out of it for commit footers, PRs inherit it, and a consistent11`<type>/<TICKET>-<slug>` shape makes branches self-describing in a busy repo.1213## 1. Find the JIRA ticket1415The branch should carry the ticket ID (`PUB-4204` style — any `PROJ-123`16pattern) whenever the work has one. Look for it in this order:17181. The user's request or earlier conversation.192. Documents driving the work: a requirements doc under `docs/requirements/`,20 a plan under `docs/plans/`, a pasted ticket or spec.213. If none is found, ask the user for one — a one-line question is cheaper22 than renaming a branch later. Branching without a ticket is fine when the23 user confirms there isn't one; never invent an ID.2425## 2. Name the branch2627```text28<type>/<TICKET-ID>-<short-slug> # feat/PUB-4204-site-creation29<type>/<short-slug> # fix/dropdown-focus-trap (no ticket)30```3132- `<type>` uses the same taxonomy as create-commit (`feat`, `fix`, `chore`,33 `docs`, `refactor`, …) and describes the work about to happen.34- `<short-slug>` is kebab-case, 2–5 words, describing the change — not the35 ticket title verbatim.36- All lowercase — except the ticket ID, which keeps its canonical uppercase37 form (`PUB-4204`, never `pub-4204`; create-commit's footer extraction and38 JIRA both expect it). No spaces, underscores, or trailing dashes.3940## 3. Cut it from an up-to-date base41421. Identify the base branch — the repo's default (`gh repo view --json43 defaultBranchRef -q .defaultBranchRef.name`), unless the repo's convention44 is to branch from `develop`; where recent PRs merge tells you45 (`gh pr list --limit 20 --json baseRefName`).462. Check the name is free **before creating anything**:47 `git branch --list <name>` and `git ls-remote --heads origin <name>`. If48 it already exists, ask whether to switch to it instead — never reuse a49 name for different work.503. Check the working tree (`git status`). Uncommitted changes that belong to51 the new work simply ride along to the new branch. Changes that belong to52 *other* work should be surfaced to the user before switching — don't let53 them silently migrate.544. Create from the fetched remote base, not the local copy:55 `git fetch origin <base> && git checkout -b <name> origin/<base>`. A56 `git pull` on the local base would merge any stray local commits sitting57 there, and the new branch — and eventually its PR — would inherit them;58 branching from `origin/<base>` sidesteps that entirely. If currently on59 another feature branch, confirm with the user whether to stack on it60 instead of branching from the base.6162Report the created branch and its base. The natural next steps are the work63itself, then **create-commit** for each reviewed change, and **raise-pr** when64the branch is ready.
Pubx-ai