Skip to main content
skill CX Codex

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

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓
npx skills add vstorm-co/pydantic-deepagents --skill git-workflow -a claude-code
Open on GitHub

What 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-code

2Manually: put the files in place

~/.claude/skills/git-workflow/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/git-workflow/

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.

git-workflow affaan-m git-workflow — a skill that hands your agent Git conventions: which branching strategy to pick, how to word commits, and when rebase beats merge. CX Codex +1 6,800installs git-workflow agno-team git-workflow — a skill that enforces best practices for commits, branch names, and pull requests. Includes commit message validation, branch naming templates, and PR checklist structure — useful if your team has git standards. CX Codex +1 675installs git-workflow ruvnet git-workflow is a Claude Code skill for branch management, merge conflicts, and PR coordination. It activates for complex Git work, including release branches and pull request workflows. CX Codex +1 743installs git-workflow Galaxy-Dawn git-workflow enforces Git standards: Conventional Commits, branch naming, no-ff merge flows, and conflict resolution. Useful for teams needing consistent version control habits. CX Codex +1 382installs git-workflow jezweb git-workflow guides Git work for pull requests, merged-branch cleanup, conflict resolution, and monorepo release tags in Claude Code. CX Codex +1 1,300installs git-master JosiahSiegel git-master — a Git skill for coding agents: command reference, safety rails around destructive operations, and recovery steps. Useful when the agent touches repo history. CX Codex +1 822installs git-rebase Pedro Nauck git-rebase walks an agent through a rebase and settles conflicts commit by commit, leaving unrelated work alone. Useful when a branch has fallen behind its base. CX Codex +1 401installs git-integrate LegendApp git-integrate drives a rebase, merge, cherry-pick or revert through verified completion and leaves unrelated work alone. Useful when an operation stalls on a conflict. CX Codex +1 391installs git-workflow-expert curiositech git-workflow-expert — a git skill covering branching strategies, merge conflicts, rebase workflows, and recovery commands like bisect and reflog. Handy when history gets messy or a commit goes missing. CX Codex +1 143installs git-advanced-workflows Seth Hobson The git-advanced-workflows skill covers Git history editing, commit transfers, bug hunting, worktrees, and reflog recovery. Use it for complex branches or cleaner pull requests. CX Codex +1 19,356installs git-stinger Legion Code Inc. git-stinger guides agents through complex Git tasks, from reflog recovery and interactive rebase to safe disposable sandbox practice exercises. CX Codex +1 ★ 96repo stars

From the same set14

The whole set →
refactor The refactor skill guides code changes that improve structure while preserving external behavior. Use it to break up long functions, remove duplication, or make naming consistent. CX Codex +1 ★ 1,125repo stars code-review code-review is a Claude Code skill that checks code for bugs, security issues, style, and performance problems. Ask for a review to run it. CX Codex +1 ★ 1,125repo stars test-writer test-writer generates structured test suites for existing code matching your active testing framework. CX Codex +1 ★ 1,125repo stars skill-creator skill-creator is a Claude Code skill that turns a recurring task from a conversation into reusable instructions for an AI agent. It captures workflows for future sessions. CX Codex +1 ★ 1,125repo stars environment-discovery The environment-discovery skill trains Claude Code to systematically explore unfamiliar environments before making changes. It checks file structure, data formats, available tools, and existing code—saving debugging time. CX Codex +1 ★ 1,125repo stars report-writing report-writing provides guidelines for structuring analytical reports, drafting stand-alone executive summaries, and citing sources. CX Codex +1 ★ 1,125repo stars build-and-compile The build-and-compile skill helps Claude Code choose build commands from a project's files and troubleshoot compiler or dependency errors. Use it when a build fails or the project setup is unclear. CX Codex +1 ★ 1,125repo stars research-methodology research-methodology — a skill with methodology for structured research: three-phase search, source reliability ranking, and note-taking with confidence levels for each finding. CX Codex +1 ★ 1,125repo stars

Project sponsors

Companies that keep this analytics open