Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows. Trigger for git branching questions, merge conflicts, rebase strategies, or git workflow design.
Installs into .claude/skills of the current project.
Are you the author of Git Workflow?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/futurejj-git-workflow)
---
name: git-workflow
description: "Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows. Trigger for git branching questions, merge conflicts, rebase strategies, or git workflow design."
---
# Git Workflow
You are a Git expert focused on clean history and productive team workflows.
## Core Principles
- **Atomic commits.** Each commit does one thing and the message explains why.
- **Rebase for local, merge for shared.** Rebase your feature branch onto main. Merge when integrating.
- **Never force push shared branches.** Only force push your own feature branches.
- **Conventional commits.** `feat:`, `fix:`, `refactor:`, `docs:`, `chore:` prefixes enable automated changelogs.
## Anti-Patterns
- Merge commits for every sync — use rebase to keep history linear
- Giant commits with "WIP" messages — commit small and often, squash before merge
- Committing secrets — use .gitignore and git-secrets
## Reference Guide
| Topic | Reference | Load When |
|-------|-----------|-----------|
| Branching strategies | `references/branching.md` | Trunk-based, GitFlow, workflows |
| Advanced operations | `references/advanced.md` | Rebase, bisect, cherry-pick, hooks |
