Git Workflow Strategies: GitFlow, GitHub Flow, and Trunk-Based Development

Main Branches: ├── main (or master)     - Production-ready code └── develop              - Integration branch for features Supporting Branches: ├── feature/*            - New features ├── release/*            - Release preparation └── hotfix/*             - Emergency production fixes

# Start a new feature
git checkout develop
git checkout -b feature/user-authentication

# Work on feature
git add .
git commit -m "Add login form"
git commit -m "Implement JWT authentication"

# Finish feature
git checkout develop
git merge --no-ff feature/user-authentication
git branch -d feature/user-authentication
git push origin develop

# Prepare release
git checkout -b release/1.0.0 develop
# Bug fixes only on release branch
git commit -m "Update version to 1.0.0"

# Finish release
git checkout main
git merge --no-ff release/1.0.0
git tag -a v1.0.0 -m "Release version 1.0.0"
git checkout develop
git merge --no-ff release/1.0.0
git branch -d release/1.0.0

# Emergency hotfix
git checkout -b hotfix/1.0.1 main
git commit -m "Fix critical security bug"
git checkout main
git merge --no-ff hotfix/1.0.1
git tag -a v1.0.1
git checkout develop
git merge --no-ff hotfix/1.0.1
git branch -d hotfix/1.0.1

├── main                 - Always deployable └── feature branches     - Short-lived branches for any work

# Create feature branch
git checkout main
git pull origin main
git checkout -b add-user-profile

# Work and commit
git add .
git commit -m "Add user profile component"
git push origin add-user-profile

# Open Pull Request on GitHub
# Code review happens here
# CI/CD runs automated tests

# After approval, merge to main
git checkout main
git pull origin main
# Usually done via GitHub UI with "Squash and merge"

# Deploy main to production
# This happens automatically via CI/CD

# Delete feature branch
git branch -d add-user-profile
git push origin --delete add-user-profile

├── trunk (main)         - Everyone commits here frequently └── release branches     - Optional, created from trunk for releases

# Direct commits to trunk (for small changes)
git checkout main
git pull origin main
# Make small change
git add .
git commit -m "Update button color"
git push origin main

# Short-lived feature branch (< 1 day)
git checkout -b quick-feature
# Work for a few hours
git add .
git commit -m "Add feature"
git push origin quick-feature
# Create PR and merge immediately after CI passes

# Feature flags for incomplete features
git checkout main
// code.js
if (featureFlags.newFeature) {
  // New code (not ready for production)
} else {
  // Old code
}
git commit -m "Add new feature behind flag"
git push origin main  // Safe to deploy!

# Release branches (optional)
git checkout -b release/2024-02-11 main
git push origin release/2024-02-11
# Deploy this branch to production
# Bug fixes cherry-picked back to main

Aspect          | GitFlow      | GitHub Flow  | Trunk-Based
----------------|--------------|--------------|-------------
Complexity      | High         | Low          | Very Low
Branches        | 5+ types     | 2 types      | 1-2 types
Release Cycle   | Scheduled    | Continuous   | Continuous
CI/CD Required  | Optional     | Recommended  | Essential
Team Size       | Large        | Any          | Any
Learning Curve  | Steep        | Easy         | Medium
Merge Frequency | Low          | Medium       | Very High
Conflict Risk   | High         | Medium       | Low
Version Support | Multiple     | Single       | Single

# Good commit messages
git commit -m "Add user authentication with JWT"
git commit -m "Fix: Handle null pointer in user service"
git commit -m "Refactor: Extract payment logic to separate service"

# Use conventional commits
git commit -m "feat: add user profile page"
git commit -m "fix: resolve login redirect bug"
git commit -m "docs: update API documentation"
git commit -m "test: add unit tests for auth service"

# Regularly sync with main
git checkout feature-branch
git fetch origin
git rebase origin/main  # or merge
git push --force-with-lease  # if rebasing

## Description
Brief description of changes

## Type of Change
- [ ] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update

## Testing
- [ ] Unit tests added/updated
- [ ] Integration tests passed
- [ ] Manual testing completed

## Checklist
- [ ] Code follows style guidelines
- [ ] Self-review completed
- [ ] Documentation updated
- [ ] No console errors

# .github/workflows/ci.yml
name: CI

on:
  pull_request:
    branches: [main]
  push:
    branches: [main]

jobs:
  test:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - name: Run tests
        run: npm test
      - name: Run linter
        run: npm run lint
      - name: Check formatting
        run: npm run format:check