# Git Workflow > Git workflow best practices, branch management, semantic commits, and collaboration strategies - Skill: `lodetomasi/git-workflow` (Agent Skill) - Install (CLI): `npx skillmds@latest add lodetomasi/git-workflow` - Raw SKILL.md: https://api.skillmd.com/api/skills/lodetomasi/git-workflow/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: lodetomasi (https://skillmd.com/u/lodetomasi) - Updated: 2026-09-22 - Page: https://skillmd.com/skills/lodetomasi/git-workflow --- # Git Workflow Skill ## Overview Comprehensive Git workflow skill covering branching strategies, semantic commits, pull request management, conflict resolution, and team collaboration best practices. ## Capabilities ### 1. Branching Strategies - GitFlow workflow - GitHub Flow - Trunk-based development - Feature branch workflow - Release management ### 2. Commit Management - Semantic commit messages - Conventional commits - Atomic commits - Interactive rebasing - Commit squashing ### 3. Collaboration - Pull request workflows - Code review integration - Conflict resolution - Fork management - Team synchronization ### 4. Release Management - Version tagging - Changelog generation - Semantic versioning - Release branches - Hotfix workflows ## Branching Strategies ### GitFlow **Branch Types**: - `main` - Production-ready code - `develop` - Integration branch - `feature/*` - New features - `release/*` - Release preparation - `hotfix/*` - Production fixes **Workflow**: ```bash # Start new feature git checkout develop git checkout -b feature/user-authentication # Work on feature... git add . git commit -m "feat: add login form" # Complete feature git checkout develop git merge --no-ff feature/user-authentication git branch -d feature/user-authentication # Prepare release git checkout -b release/1.2.0 develop # Bug fixes only... git checkout main git merge --no-ff release/1.2.0 git tag -a v1.2.0 -m "Release version 1.2.0" git checkout develop git merge --no-ff release/1.2.0 git branch -d release/1.2.0 # Hotfix git checkout -b hotfix/1.2.1 main # Fix critical bug... git checkout main git merge --no-ff hotfix/1.2.1 git tag -a v1.2.1 -m "Hotfix version 1.2.1" git checkout develop git merge --no-ff hotfix/1.2.1 git branch -d hotfix/1.2.1 ``` ### GitHub Flow **Simpler workflow for continuous deployment**: ```bash # Create feature branch from main git checkout main git pull origin main git checkout -b feature/add-search # Make changes and commit git add . git commit -m "feat: implement search functionality" # Push and create PR git push -u origin feature/add-search gh pr create --title "Add search functionality" --body "..." # After review and CI passes gh pr merge --squash # Delete branch git branch -d feature/add-search ``` ### Trunk-Based Development **For teams with strong CI/CD**: ```bash # Always work on main (or short-lived branches) git checkout main git pull origin main # Short-lived branch (< 1 day) git checkout -b improvement/optimize-query # Small, frequent commits git add . git commit -m "perf: optimize user query with indexing" # Merge quickly git push origin improvement/optimize-query # Create PR, get quick review, merge ``` ## Semantic Commit Messages ### Conventional Commits Format ``` ():