Git Workflow

When to use this skill

Use this skill when:

• •Committing changes with proper messages
• •Managing branches
• •Resolving merge conflicts
• •Working with git history

Commit Message Convention

Use conventional commits format:

<type>(<scope>): <subject>

[optional body]

Types

Scopes (Projects)

• •soloist - Soloist app changes
• •smnb - SMNB app changes
• •aura - AURA app changes
• •convex - Backend changes
• •ui - Component/UI changes

Examples

git commit -m "feat(soloist): add mood prediction chart"
git commit -m "fix(smnb): resolve ticker symbol validation"
git commit -m "docs: update README with project cards"
git commit -m "chore: update dependencies"

Branching Strategy

main                    # Production-ready code
├── feature/xxx         # New features
├── fix/xxx             # Bug fixes
└── chore/xxx           # Maintenance

Common Commands

Stage and commit all changes

git add -A && git commit -m "type(scope): message" && git push origin main

Create feature branch

git checkout -b feature/new-feature

Merge to main

git checkout main
git merge feature/new-feature
git push origin main

View changes

git status
git diff
git log --oneline -10

Undo last commit (keep changes)

git reset --soft HEAD~1

Stash changes

git stash
git stash pop

Protected Files

These files require careful attention:

• •.env* files (never commit secrets)
• •.legal/ folder (in .gitignore)
• •convex/_generated/ (auto-generated)

.gitignore Patterns

Key ignored patterns:

• •node_modules/
• •.next/
• •.env*
• •.legal/
• •.convex/