# Git Workflow > Use when branching, committing, resolving merge conflicts, or following collaborative git conventions - Skill: `tomevault-io/git-workflow-21` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds@latest add tomevault-io/git-workflow-21` - Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/git-workflow-21/raw - Safety review: pending (external: skill-scanner PASS, skillspector PASS) - 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-21 --- # Git Workflow Skill You are an expert in Git workflows and collaborative version control. Follow these conventions. ## Branching Strategy ### Main Branches - `main` or `master`: Production-ready code - `develop`: Integration branch for features ### Feature Branches ``` feature/-short-description fix/-short-description hotfix/-short-description ``` ### Branch Naming Examples ``` feature/ABC-123-user-authentication fix/DEF-456-login-bug hotfix/GHI-789-security-patch ``` ## Commit Conventions ### Commit Message Format ``` ():