git-workflow
A comprehensive guide for effective git usage, including commit conventions and branching workflows.
Install
mkdir -p .claude/skills/git-workflow-ysmsimon && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/11307" && unzip -o skill.zip -d .claude/skills/git-workflow-ysmsimon && rm skill.zipInstalls to .claude/skills/git-workflow-ysmsimon
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Guide git workflows including writing commit messages, structuring branches, writing PR descriptions, resolving merge conflicts, squashing commits, rebasing, tagging releases, and undoing mistakes. Use this skill whenever the user wants help with a commit message, pull request, branching strategy, git history, rebasing, undoing a commit, stashing, or anything git-related. Trigger on phrases like "write a commit message", "help me PR this", "how should I branch", "clean up my commits", "git conflict", "undo", "revert", "stash", or any git command question.Key capabilities
- →Write conventional commit messages
- →Define branching strategies
- →Resolve merge conflicts
- →Perform rebasing and squashing
How it works
It provides templates and rules for git operations based on the Conventional Commits standard and common branching strategies.
Inputs & outputs
When to use git-workflow
- →Write conventional commit messages
- →Define branching strategies
- →Resolve merge conflicts
About this skill
Git Workflow
Help the user work effectively with git — from individual commits to full branching strategies and pull request descriptions.
Commit messages — Conventional Commits
Format
<type>(<scope>): <short summary>
<optional body — explain WHY, not what>
<optional footer>
Types
| Type | When to use |
|---|---|
feat | New user-facing feature |
fix | Bug fix |
refactor | Code restructuring, no behaviour change |
perf | Performance improvement |
test | Adding or fixing tests |
docs | Documentation only |
chore | Build, deps, tooling |
ci | CI/CD pipeline |
revert | Reverting a previous commit |
Rules
- Summary: max 50 chars, imperative mood ("add" not "added"), no trailing period
- Blank line between summary and body
- Body: explain why — the diff shows what
- Wrap body at 72 characters
- Reference issues in footer:
Closes #42
Branching strategy
GitHub Flow (default — simple projects, CI/CD)
mainis always deployable- Branch for every feature or fix
- PR → review → merge to
main
Branch naming: feature/jwt-refresh, fix/profile-update-race, chore/upgrade-dependencies
Git Flow (versioned releases, larger teams)
main: production, always taggeddevelop: integration branchfeature/*: from develop, back to developrelease/*: from develop when prepping a releasehotfix/*: from main for urgent fixes, merge back to both main and develop
When the user provides context
If they share a diff or describe changes — write the commit message directly, don't just explain the format.
If they show a messy branch history — recommend the exact rebase commands with the real commit count.
If they describe a PR — write the full PR description using the template.
When not to use it
- →When the team has a strictly enforced, different workflow
Prerequisites
Limitations
- →Requires team adoption for full effectiveness
How it compares
It standardizes git history and communication, whereas manual git usage often leads to inconsistent logs.
Compared to similar skills
git-workflow side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| git-workflow (this skill) | 0 | 3mo | No flags | Beginner |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| dependency-upgrade | 26 | 5mo | Review | Intermediate |
| git-commits | 21 | 4mo | No flags | Beginner |
Try saying
Example prompts that trigger this skill in your AI assistant.
You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
dependency-upgrade
wshobson
Manage major dependency version upgrades with compatibility analysis, staged rollout, and comprehensive testing. Use when upgrading framework versions, updating major dependencies, or managing breaking changes in libraries.
git-commits
bonny
Create well-structured git commits in logical chunks following best practices
git-advanced-workflows
wshobson
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
github-multi-repo
ruvnet
Multi-repository coordination, synchronization, and architecture management with AI swarm orchestration
git-workflow-enforcer
CrazyDubya
Ensures commits follow conventional commits, branch naming conventions, and PR templates. Use when creating commits, branches, or PRs, or when user mentions git workflow.