git-workflow · vstorm-co — Claude Code skill: what it does, how to install
git-workflow standardizes Git operations for Claude Code, covering commit messages, feature branches, PRs, and rebase conflict handling.
MIT ★ 1,125 updated 2026-10-27
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a claude-codeWhat git-workflow does
The skill sets strict Git conventions. Commit subjects follow <type>: <description> with a 72-character limit for the first line and verbs in lowercase. Allowed types include feat, fix, refactor, test, docs, style, and chore.
Branching uses a fixed path: start feat/description off main, push small commits, and finish with a squash-merge. When resolving merge conflicts, the assistant fetches origin, rebases onto origin/main, inspects both versions, and runs tests before executing git rebase --continue.
The rules strictly ban force-pushing to main or master and stop secrets or .env files from entering the repo.
What it helps with
- Format commit messages under 72 characters using standard types
- Manage feature branches and prepare squash-merges
- Rebase on origin/main and resolve conflicts safely
- Block accidental secret and .env file commits
Example prompts for the agent
- Commit the recent changes to the authentication handler
- Create a branch for the new export feature and open a PR
- Resolve the merge conflicts during rebase on origin/main
How to install git-workflow
1Skills CLI (Vercel)
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a claude-code2Manually: put the files in place
~/.claude/skills/git-workflow/SKILL.mdCopy the whole skill folder; for one project use .claude/skills/git-workflow/
1Skills CLI (Vercel)
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a codex2Manually: put the files in place
.agents/skills/git-workflow/SKILL.mdFor all projects use ~/.agents/skills/
1Skills CLI (Vercel)
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a cursor2Manually: put the files in place
.cursor/skills/git-workflow/SKILL.mdCursor also reads .agents/skills/ and .claude/skills/
1GitHub CLI
gh skill install vstorm-co/pydantic-deepagents apps/cli/skills/git-workflow2Manually: put the files in place
.github/skills/git-workflow/SKILL.md1Skills CLI (Vercel)
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a gemini-cli2Platform CLI
gemini skills install https://github.com/vstorm-co/pydantic-deepagents --path apps/cli/skills/git-workflowManually: put the files in place
.devin/skills/git-workflow/SKILL.mdThe legacy .windsurf/skills/ path still works
Claude.ai
Zip the folder and upload it in Settings → Capabilities → Skills
Step by step, with commands for each platform: How to install skills in Claude Code: five ways
Questions about git-workflow
How to install git-workflow in Claude Code?
Run npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a claude-code in your terminal.
What does the git-workflow skill do?
It instructs Claude Code to follow structured Git habits, including conventional commits, feature branch lifecycles, and tested rebase resolutions.
Can this skill force-push to the main branch?
No. The safety rules explicitly prohibit force-pushing to main or master.
Source text
SKILL.md · MIT
--- name: git-workflow description: "Git operations: commits, branches, PRs, and conflict resolution" tags: [git, workflow] version: "1.0.0" --- # Git Workflow ## Commit Messages Format: `<type>: <description>` Types: feat, fix, refactor, test, docs, style, chore - Description starts with lowercase verb - Max 72 characters for first line - Add body for complex changes ## Branch Workflow 1. Create feature branch from main: `git checkout -b feat/description` 2. Make changes in small, focused commits 3. Push and create PR 4. After review, squash-merge to main ## Conflict Resolution 1. `git fetch origin` 2. `git rebase origin/main` (or merge if team prefers) 3. For each conflict: - Read both versions carefully - Understand the intent of each change - Resolve preserving both intents - Test after resolving 4. `git rebase --continue` ## Safety Rules - Never force-push to main/master - Never commit secrets, credentials, or .env files - Always check `git diff` before committing - Use `git stash` before switching branches with uncommitted changes
© vstorm-co · MIT · vstorm-co/pydantic-deepagents
Similar skills
All skills for Git and GitHub →git-workflow by other authors comes first.