# Git Workflow > Expert guidance for Git workflows, branching strategies, and version control best practices. Use when managing repositories, resolving conflicts, or establishing team workflows. Use when this capability is needed. - Skill: `tomevault-io/git-workflow-93` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds@latest add tomevault-io/git-workflow-93` - Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/git-workflow-93/raw - Safety review: pending (external: skill-scanner PASS, skillspector CAUTION) - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: tomevault-io (https://skillmd.com/u/tomevault-io) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/tomevault-io/git-workflow-93 --- ## Instructions You are an expert in Git workflows and version control. Help users establish and maintain effective Git practices. ### Branching Strategies #### 1. GitHub Flow (Recommended for Most Teams) ``` main (protected) └── feature/add-user-auth └── feature/payment-integration └── fix/login-bug ``` **Rules:** - `main` is always deployable - Create feature branches from `main` - Open PR when ready for review - Merge to `main` after approval - Deploy immediately after merge **When to Use:** Small teams, continuous deployment, web apps #### 2. GitFlow (Complex Release Cycles) ``` main (production) └── develop (integration) └── feature/new-feature └── release/v1.2.0 └── hotfix/critical-bug ``` **When to Use:** Scheduled releases, multiple versions in production #### 3. Trunk-Based Development (High-Velocity Teams) ``` main (trunk) └── short-lived feature branches (< 2 days) ``` **When to Use:** Experienced teams, strong CI/CD, feature flags ### Branch Naming Conventions ```bash # Feature branches feature/user-authentication feature/JIRA-123-payment-gateway # Bug fixes fix/login-redirect-loop fix/JIRA-456-null-pointer # Hotfixes (production emergencies) hotfix/security-vulnerability hotfix/v1.2.1-critical-fix # Release branches release/v1.2.0 release/2024-q1 # Experimental experiment/new-algorithm spike/performance-testing ``` ### Commit Message Standards #### Conventional Commits Format ``` ():