Git Workflow
affaan-m/everything-claude-codeA good Git workflow helps your team work together without breaking each other's changes. This guide covers the most common ways to organize your branches. It also shows you how to write clear commit messages and fix merge conflicts.
You will learn about three main branching strategies: GitHub Flow, Trunk-Based Development, and GitFlow. Each one works best for different team sizes and release schedules. The guide also explains Conventional Commits, a simple format for commit messages that makes your project history easy to read.
These best practices are useful for setting up a new project or onboarding new team members. They help keep your code organized and your releases smooth. Use this guide to build a solid collaborative development process.
Add Git Workflow skill to your workflow
Global
mkdir -p ~/.claude/skills/git-workflowProject
mkdir -p .claude/skills/git-workflowSource Repository
More Git & Pull Requests Claude Code Skills
Caveman Commitjuliusbrussee/caveman
Generate ultra-compressed commit messages with Conventional Commits format
Verification Before Completionobra/superpowers
Always run fresh verification before claiming work is complete or passing
Git Guardrails Claude Codemattpocock/skills
Stop dangerous git commands from running automatically with safety hooks
Setup Pre Commitmattpocock/skills
Automate code formatting type checking and tests before every commit
Using Git Worktreesobra/superpowers
Isolate your feature work with git worktrees and keep your main branch safe
Finishing A Development Branchobra/superpowers
Finish your development branch with merge, pull request, or cleanup options
Resolving Merge Conflictsmattpocock/skills
Resolve Git merge conflicts step by step preserving both intents
Git Commitgithub/awesome-copilot
Automatically write standardized git commits by analyzing your code changes