Collection

Name: Collection
Author: mattnigh

ASecurity

Git workflows, branching strategies, and commit conventions

24 stars

0 votes

0 copies

0 views

Added 9/8/2026

code-qualitybashgitapidevopsci/cd

Works with

api

Security Analysis

A100/100

Scanned 9/8/2026

Install to Claude Code

$npx -y skills add mattnigh/skills_collection --skill collection --agent claude-code

Installs into .claude/skills of the current project.

Are you the author of Collection?

Add the live security badge to your README — it updates automatically with every re-scan.

[![Security: A — Skills Directory](https://www.skillsdirectory.com/api/skills/mattnigh-collection-e940f400/badge)](https://www.skillsdirectory.com/skills/mattnigh-collection-e940f400)

More formats (shields.io, HTML) on the badges page.

Files

0Chan-smc__claude-code-workflow-lab__claude__skills__frontend-dev-guidelines__SKILL.md

---
name: moai-foundation-git
version: 4.0.0
updated: 2025-11-20
status: stable
tier: foundation
description: Git workflows, branching strategies, and commit conventions
allowed-tools: [Read, Bash]
---

# 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

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

```bash
# 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

```bash
git checkout -b feature/user-profile
```

### 2. Make Changes & Commit

```bash
git add .
git commit -m "feat(profile): add user profile page"
```

### 3. Push & Create PR

```bash
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

```bash
# Squash merge (clean history)
git merge --squash feature/user-profile

# Or rebase (preserve commits)
git rebase main
```

---

## Best Practices

1.  **Small Commits**: One logical change per commit
2.  **Descriptive Messages**: Explain _why_, not just _what_
3.  **Atomic Commits**: Each commit should leave code in working state
4.  **Linear History**: Use rebase to avoid merge commits
5.  **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 workflow
- `moai-devops-ci`: CI/CD integration

---

**Last Updated**: 2025-11-20

Collection

Works with

Security Analysis

Attribution

Comments (0)