Skip to content

Commit 466c228

Browse files
Nick Sullivanclaude
andcommitted
🏗️ Simplify branch naming: verb-first descriptions + hotfix workflow
Type prefixes like feat/, fix/, docs/ are redundant - the branch name itself tells you what it does. This change adopts verb-first descriptive names across all work (add-oauth, fix-cache-bug, update-docs). The only useful prefix is hotfix/ because it triggers different behavior: expedited review focused on security and bugs, declining style suggestions, one pass only. This gives workflow prefixes semantic weight instead of just categorizing change types. Updated address-pr-comments.md to detect hotfix branches and run streamlined review: faster feedback on emergency fixes rather than the full polish cycle. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 38c3e55 commit 466c228

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

.claude/commands/address-pr-comments.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,18 @@ Read @rules/code-review-standards.mdc for triage principles:
2929
Use provided PR number, or detect from current branch. Exit if no PR exists.
3030
</pr-detection>
3131

32+
<hotfix-mode>
33+
If the branch name starts with `hotfix/`, switch to expedited review mode:
34+
35+
- Only address security vulnerabilities and actual bugs
36+
- Decline ALL style, refactoring, and "improvement" suggestions
37+
- Skip theoretical concerns - focus on "will this break production?"
38+
- One pass only - don't wait for bot re-reviews after fixes
39+
- Speed over polish - this is an emergency
40+
41+
Announce hotfix mode at start: "Hotfix branch detected - running expedited review.
42+
Addressing only security issues and bugs, declining all other feedback." </hotfix-mode>
43+
3244
<comment-sources>
3345
Code review bots comment in different places. Fetch both:
3446
- PR comments (general feedback on the PR itself)

rules/git-interaction.mdc

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -294,48 +294,41 @@ Feature with context:
294294

295295
## Branch Naming Conventions
296296

297-
Branch names should be clear, descriptive, and follow a consistent pattern that makes
298-
the type and purpose of work immediately obvious.
297+
Branch names should be verb-first and descriptive. Type prefixes like `feat/` `fix/`
298+
`docs/` add no value - the branch name itself tells you what it does.
299299

300300
### Format
301301

302302
```
303-
<type>/<short-description>
303+
verb-description
304304
```
305305

306-
### Types
306+
Start with a verb that describes the action: add, fix, update, refactor, remove.
307307

308-
- `feature/` - New features or enhancements
309-
- `fix/` - Bug fixes
310-
- `refactor/` - Code restructuring without behavior changes
311-
- `docs/` - Documentation updates
312-
- `test/` - Adding or updating tests
313-
- `chore/` - Maintenance, dependencies, tooling
308+
### Examples
314309

315-
### Guidelines
310+
- `add-oauth-authentication`
311+
- `fix-cache-race-condition`
312+
- `update-deployment-docs`
313+
- `refactor-payment-processing`
314+
- `remove-deprecated-api`
316315

317-
- Use lowercase with hyphens for spaces
318-
- Keep descriptions short but meaningful (2-4 words)
319-
- Be specific enough to understand the work without context
320-
- Avoid ticket numbers alone - include description
316+
### Workflow Prefixes
321317

322-
### Examples
318+
The only useful prefixes signal different workflows, not change types:
323319

324-
Good:
320+
**`hotfix/`** - Emergency production fix. Triggers expedited review (fewer nitpicks,
321+
focus on correctness). Use when something is broken in production and needs immediate
322+
attention.
325323

326-
- `feature/oauth-authentication`
327-
- `fix/mobile-upload-cors`
328-
- `refactor/payment-processing`
329-
- `docs/api-authentication-guide`
330-
- `test/user-registration-flow`
331-
- `chore/upgrade-dependencies`
324+
Example: `hotfix/fix-payment-timeout`
332325

333-
Avoid:
326+
### Guidelines
334327

335-
- `fix-bug` (too vague)
336-
- `TICKET-1234` (not descriptive)
337-
- `johns-branch` (not descriptive)
338-
- `update` (too generic)
328+
- Use lowercase with hyphens
329+
- Keep it short but meaningful (2-5 words)
330+
- Be specific enough to understand without context
331+
- The verb naturally categorizes the work
339332

340333
## Operating Philosophy
341334

0 commit comments

Comments
 (0)