git-repository

Git Repository Management Skill

This skill provides comprehensive guidance on repository management strategies, branching models, repository organization patterns, and scaling git for large teams and codebases.

When to Use

Activate this skill when:

• Setting up new repository structure
• Choosing branching strategy
• Managing monorepo vs polyrepo
• Organizing multi-project repositories
• Implementing submodule or subtree strategies
• Scaling git for large teams
• Migrating repository structures
• Establishing team workflows

Branching Strategies

Git Flow

Branch Structure:

• main (or master) - Production releases only
• develop - Integration branch for next release
• feature/* - Feature development branches
• release/* - Release preparation branches
• hotfix/* - Emergency production fixes

Workflow:

# Feature Development
git checkout develop
git checkout -b feature/user-authentication
# Work on feature...
git commit -m "feat: add JWT authentication"
git checkout develop
git merge --no-ff feature/user-authentication
git branch -d feature/user-authentication

# Release Preparation
git checkout develop
git checkout -b release/v1.2.0
# Bump version, update changelog, final testing...
git commit -m "chore: prepare release v1.2.0"

# Deploy Release
git checkout main
git merge --no-ff release/v1.2.0
git tag -a v1.2.0 -m "Release version 1.2.0"
git checkout develop
git merge --no-ff release/v1.2.0
git branch -d release/v1.2.0
git push origin main develop --tags

# Hotfix
git checkout main
git checkout -b hotfix/security-patch
git commit -m "fix: patch security vulnerability"
git checkout main
git merge --no-ff hotfix/security-patch
git tag -a v1.2.1 -m "Hotfix v1.2.1"
git checkout develop
git merge --no-ff hotfix/security-patch
git branch -d hotfix/security-patch
git push origin main develop --tags

Best For:

• Scheduled releases
• Multiple production versions
• Large teams with QA process
• Products with maintenance windows
• Enterprise software