# Git Workflow > Manage git operations, branching strategies, and version control workflows. Use when creating branches, merging changes, resolving conflicts, or implementing git best practices. - Skill: `hallucinaut/git-workflow` (Agent Skill) - Install (CLI): `npx skillmds@latest add hallucinaut/git-workflow` - Raw SKILL.md: https://api.skillmd.com/api/skills/hallucinaut/git-workflow/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: hallucinaut (https://skillmd.com/u/hallucinaut) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/hallucinaut/git-workflow --- # Git Workflow Skill Manage git operations, branching strategies, and version control workflows. ## When to Use Use this skill when the user wants to: - Create and manage git branches - Implement branching strategies (Git Flow, trunk-based) - Merge and resolve conflicts - Create pull requests - Rebase and squash - Manage git history - Configure git settings ## Git Workflow Patterns ### Branching Strategies #### Git Flow ``` main → develop → feature/* → release/* → hotfix/* ``` #### Trunk-Based Development ``` main → PR → merge → deploy Feature branches are short-lived (1-3 days) ``` #### GitHub Flow ``` main → PR → merge → deploy Continuous deployment ``` ### Common Operations #### Branch Creation ```bash # Create feature branch git checkout -b feature/my-feature # Create issue branch git checkout -b issue/123-fix-bug # Stash changes before branching git stash push -m "WIP: working on feature" git checkout -b feature/my-feature git stash pop ``` #### Merging ```bash # Merge into branch git merge --no-ff feature/my-feature # Squash merge for clean history git merge --squash -m "Implement feature" feature/my-feature # Rebase to keep history linear git rebase main ``` #### Conflict Resolution ```bash # Resolve merge conflicts git status # Identify conflicted files git add git commit -m "Resolve merge conflicts" # Accept incoming changes git merge --theirs # Accept current changes git merge --ours ``` ### Git Best Practices #### Commits - **Atomic**: Small, focused commits - **Descriptive**: Clear commit messages - **Conventional**: Use Conventional Commits format - **Squash**: Group related changes #### Commit Message Format ``` ():