---

name: git-workflow description: Git workflow patterns for the ACDC Digital monorepo including commit conventions, branching strategy, and common operations. Use when committing code, managing branches, or resolving git issues.

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:

Copy<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

Copygit 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

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

Common Commands

Stage and commit all changes

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

Create feature branch

Copygit checkout -b feature/new-feature

Merge to main

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

View changes

Copygit status
git diff
git log --oneline -10

Undo last commit (keep changes)

Copygit reset --soft HEAD~1

Stash changes

Copygit 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/