# Git Workflow

> 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.

- Skill: `futurejj/git-workflow` (Agent Skill, multi-file: 3 files)
- Install (CLI): `npx skillmds@latest add futurejj/git-workflow`
- Raw SKILL.md: https://api.skillmd.com/api/skills/futurejj/git-workflow/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Productivity
- Author: FutureJJ (https://skillmd.com/u/futurejj)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/futurejj/git-workflow

---


# 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 |