# Moai Foundation Git > Git workflows, branching strategies, and commit conventions - Skill: `majiayu000/moai-foundation-git` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds add majiayu000/moai-foundation-git` - Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/moai-foundation-git/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Coding & Dev Tools - Author: majiayu000 (https://skillmd.com/u/majiayu000) - Updated: 2026-09-09 - Page: https://skillmd.com/skills/majiayu000/moai-foundation-git --- # Git Workflow Expert **Version Control Best Practices** > **Focus**: Branching Strategy, Commit Conventions, PR Workflow > **Standards**: Conventional Commits, Semantic Versioning --- ## Overview Production-grade Git workflows for team collaboration. ### Core Concepts 1. **Branching Strategy**: Feature branches, trunk-based development 2. **Commit Messages**: Conventional commits format 3. **PR Process**: Code review, CI/CD integration --- ## Branching Strategies ### Git Flow (Enterprise) ``` main (production) ├── develop (integration) │ ├── feature/user-auth │ ├── feature/payment │ └── release/v1.2.0 └── hotfix/critical-bug ``` ### Trunk-Based Development (Modern) ``` main (always deployable) ├── feature/short-lived-branch-1 └── feature/short-lived-branch-2 ``` **Recommendation**: Trunk-based for small teams (<10), Git Flow for larger teams. --- ## Commit Conventions ### Conventional Commits Format ``` ():