ss-sdd-choosing-feature-branch

To commit spec-driven-development planning artifacts safely, use path-scoped git add to stage only the spec and plan files. This batches planning commits onto the correct derived feature branch without disturbing unrelated dirty files in your working tree.

A derived feature branch in spec-driven-development is a stage-specific git branch created from your current branch. It isolates planning artifacts like specs, plans, and ADRs so implementation work remains separate from planning commits.

Batch-committing specs, plans, and ADRs separately involves two sequential commits on the derived feature branch. You commit the spec and plan files first, then commit any ADR files using path-scoped staging to keep the working tree clean.

Yes, when starting from the main branch, the SDD workflow can automatically resolve the ambiguity and create or checkout the correct derived feature branch. It silently settles the branch choice so planning artifacts are not committed directly to main.

Feature branch selection fails due to ambiguous git state when the current branch does not clearly match the expected derived branch name. The workflow prompts for manual confirmation to resolve the ambiguity before proceeding with the commit.

Persist the chosen git branch name by writing it to a local state.json file rather than the repository. This saves the branch_name for later SDD stages to merge and delete the branch without adding state files to git history.