git-workflow
ACDC数字单仓库的Git工作流程模式,包括提交约定、分支策略和常见操作。在提交代码、管理分支或解决git问题时使用。
📖 中文导读:ACDC数字单仓库的Git工作流程模式,包括提交约定、分支策略和常见操作。在提交代码、管理分支或解决git问题时使用。 以下正文为该技能的原始 SKILL.md 内容(英文),上方安装命令可直接使用。
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:
<type>(<scope>): <subject>
[optional body]
Types
| Type | Description |
|---|---|
feat |
New feature |
fix |
Bug fix |
docs |
Documentation changes |
style |
Formatting, no code change |
refactor |
Code restructuring |
perf |
Performance improvement |
test |
Adding tests |
chore |
Maintenance tasks |
Scopes (Projects)
soloist- Soloist app changessmnb- SMNB app changesaura- AURA app changesconvex- Backend changesui- 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/