Skip to content

fix(docs): align superpowers guide with brainstorm-to-branch conventions#3587

Open
cbini wants to merge 2 commits intocbini/docs/claude-superpowers-training-guidefrom
cbini/fix/claude-superpowers-guide-conventions
Open

fix(docs): align superpowers guide with brainstorm-to-branch conventions#3587
cbini wants to merge 2 commits intocbini/docs/claude-superpowers-training-guidefrom
cbini/fix/claude-superpowers-guide-conventions

Conversation

@cbini
Copy link
Copy Markdown
Member

@cbini cbini commented Apr 6, 2026

Summary

  • Reorder Phases 1–2: brainstorm conversation → GitHub issue → worktree/branch choice → branch creation → spec file (on the branch) — matching CLAUDE.md's brainstorm-to-branch discipline
  • Add worktree vs branch switch: document both options with brief explanations, matching the required user choice
  • Add branch naming convention: <gh-username>/<commit-type>/claude-<brief-description>
  • Add git resuming tip: Claude merges main before resuming work on an existing branch
  • Update Big Picture diagram and Quick Reference to reflect corrected ordering
  • Resolve merge conflicts with main (dbt Development and SFTP Integration added to guides index and mkdocs nav)

Why

The original draft had the spec file written before the GitHub issue and branch were created. CLAUDE.md requires: (1) issue before design doc, (2) ask user worktree or branch switch, (3) no files written until on the feature branch.

🤖 Generated with Claude Code

@cbini cbini requested review from a team as code owners April 6, 2026 16:51
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 6, 2026

Code Review in Progress

  • Gather PR context and git SHAs
  • Dispatch code-reviewer subagent (Python, Dagster, dbt, security)
  • Post review findings

View job run

@cbini cbini force-pushed the cbini/fix/claude-superpowers-guide-conventions branch from 1a3269a to 327a173 Compare April 6, 2026 16:57
@GabyRangelB
Copy link
Copy Markdown
Contributor

@cbini - This makes sense to me. One question: did we find a resolution for using worktrees in that we ended up with duplicate projects? Could we add something as to when it is better to use a worktree vs a branch? I am not very clear on that.

@cbini
Copy link
Copy Markdown
Member Author

cbini commented Apr 8, 2026

i forget exactly what the problem was with worktrees, but it's fixed. also it was a dbt power user issue.

there is an explanation about the difference -- does it need more context?

@GabyRangelB
Copy link
Copy Markdown
Contributor

i forget exactly what the problem was with worktrees, but it's fixed. also it was a dbt power user issue.

there is an explanation about the difference -- does it need more context?

@cbini - So, it sounds like Worktree is like Fork. Sorry to beat a dead horse here, but maybe we should add specific examples of when Branch vs Worktree makes more sense? I just don't know when I would ever need Worktree. Maybe that's more for, like, data mart work?

@cbini
Copy link
Copy Markdown
Member Author

cbini commented Apr 8, 2026

yeah it's not a fork. i'll clarify it some more

cbini and others added 2 commits April 8, 2026 22:40
Reorder Phases 1-2 so the GitHub issue and branch are created before the
spec file is written (matching CLAUDE.md's brainstorm-to-branch discipline).
Add worktree vs branch switch choice, branch naming convention, and git
resuming tip.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add prose descriptions and comparison table to help users choose between
branch switch and worktree workflows.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@cbini cbini force-pushed the cbini/fix/claude-superpowers-guide-conventions branch from 37488d1 to 6d1d386 Compare April 8, 2026 22:40
@cbini
Copy link
Copy Markdown
Member Author

cbini commented Apr 8, 2026

@GabyRangelB updated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants