ReddRadar
Agent skill
moai-foundation-git
Git workflows, branching strategies, and commit conventions
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/data/moai-foundation-git
SKILL.md
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
- Branching Strategy: Feature branches, trunk-based development
- Commit Messages: Conventional commits format
- 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
<type>(<scope>): <subject>
<body>
<footer>
Types
- feat: New feature
- fix: Bug fix
- docs: Documentation only
- style: Formatting (no code change)
- refactor: Code restructuring
- test: Adding tests
- chore: Build/config changes
Examples
# Feature
git commit -m "feat(auth): add JWT authentication
Implements OAuth 2.0 flow with refresh tokens.
Closes #123"
# Bug fix
git commit -m "fix(api): handle null response
Prevents crashes when API returns empty data.
Fixes #456"
# Breaking change
git commit -m "feat(api)!: change response format
BREAKING CHANGE: API now returns {data, meta} instead of raw array"
PR Workflow
1. Create Feature Branch
git checkout -b feature/user-profile
2. Make Changes & Commit
git add .
git commit -m "feat(profile): add user profile page"
3. Push & Create PR
git push -u origin feature/user-profile
# Create PR on GitHub/GitLab
4. Code Review
- ✅ CI/CD passes
- ✅ Tests added
- ✅ Documentation updated
- ✅ 1+ approvals
5. Merge
# Squash merge (clean history)
git merge --squash feature/user-profile
# Or rebase (preserve commits)
git rebase main
Best Practices
- Small Commits: One logical change per commit
- Descriptive Messages: Explain why, not just what
- Atomic Commits: Each commit should leave code in working state
- Linear History: Use rebase to avoid merge commits
- Protected Branches: Require PR reviews for
main
Validation Checklist
- Branch: Feature branch created from
main? - Commits: Follow conventional format?
- Tests: All tests passing?
- Review: PR approved by team?
- CI/CD: All checks passed?
Related Skills
moai-core-rules: Development workflowmoai-devops-ci: CI/CD integration
Last Updated: 2025-11-20
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?