1. Branch Naming Convention
When starting a ticket, create a branch from dev (create dev from main if it doesn't exist).
Format: <type>/<TICKET-ID>-<description>
Types:
- •
feat: New feature - •
fix: Bug fix - •
chore: Maintenance/Setup - •
refactor: Code restructuring
Examples:
- •
feat/CSF-101-login-page - •
fix/CSF-105-header-alignment - •
chore/CSF-001-setup-eslint
Command:
bash
git checkout dev git pull origin dev git checkout -b feat/CSF-123-description
2. Commit Messages
Follow the smart-recipe-planner-git skill for commit messages.
Format: <type>(<scope>): <description>
3. Workflow Lifecycle
A. Start Ticket
- •Ensure you are on
dev. - •Create the standardized branch.
B. Development
- •Make periodic commits following conventional commits.
- •Run tests locally.
C. Finish Ticket (Merge to Dev)
When the ticket is complete:
- •Switch to
dev. - •Pull latest changes.
- •Merge the ticket branch.
- •Push
dev.
bash
git checkout dev git pull origin dev git merge --no-ff feat/CSF-123-description git push origin dev
D. Feature/Module Complete (PR to Main)
When a full feature or module is completed on dev:
- •Legal Audit: Run the
legal-complianceskill to verify T&C and Privacy adherence. - •Create a Pull Request from
devtomain. - •Title:
Release: <Feature Name> (Module <X>) - •Description: List of included tickets/changes.
bash
gh pr create --base main --head dev --title "Release: User Auth Module" --body "Includes tickets CSF-101, CSF-102... Verified Legal Compliance."