Skills Guide

Git - Version Control Standards

VerifiedSafe

Establishes Git version control standards: conventional commit messages, branching strategy (main, develop, feat/fix), and atomic commit principles. Helps maintain a clean, semantic history that is easy to navigate and understand.

Sby Skills Guide Bot
DevelopmentBeginner
706/2/2026
Claude CodeCursorWindsurfCopilotCodex
#git#commit-conventions#branching-strategy#version-control

Recommended for

Backend developerClaude CodeCode reviewCursorFrontend developerCopilot

Our review

Establishes standards for Git usage, including conventional commit messages, branching strategies, and conflict resolution.

Strengths

  • Enforces atomic commits with structured messages (Conventional Commits)
  • Provides clear rules for workflows and branch naming
  • Includes a pre-commit checklist to avoid common mistakes

Limitations

  • Mandates a specific convention that may not fit all teams
  • Does not cover advanced operations like rebase or cherry-pick
  • May be overly rigid for personal or very small projects
When to use it

Use this skill when working on a shared codebase with multiple contributors and you want to maintain a clean, traversable history.

When not to use it

Avoid if your team already follows a different commit convention or if the project is solo and history strictness is not needed.

Security analysis

Safe
Quality score90/100

The skill provides only guidelines and standards for using Git, with no embedded commands or instructions that would execute harmful operations. It explicitly advises against committing sensitive data and promotes safe practices.

No concerns found

Examples

Commit message for a feature
Write a commit message following conventional commits for implementing JWT token validation in the authentication module.
Branching strategy for a bug fix
Suggest a branching strategy and branch name for fixing an issue where search results are not handled gracefully when empty.
Pre-commit review
Check my current git status and staged files, and help me stage only relevant changes while ignoring node_modules and .env files before committing.

name: git description: Standards for version control, commit messages, and branching strategy allowed-tools: run_command version: 1.0 priority: CRITICAL

Git - Version Control Standards

CRITICAL SKILL - Maintain a clean, traversable, and semantic history.

Core Principles

| Principle | Rule | |-----------|------| | Atomic Commits | One logical change per commit (e.g., "Fix bug" vs "Fix bug and add feature") | | Conventional Commits | Use structured messages (feat, fix, docs, refactor, etc.) | | Clean History | Don't commit broken code. Squash WIP commits before merging. | | Ignore Artifacts | Never commit derived files (builds, local configs, secrets). |

Commit Message Convention

Follow the Conventional Commits specification:

<type>(<scope>): <subject>

<body>

<footer>

Types

| Type | Description | |------|-------------| | feat | A new feature | | fix | A bug fix | | docs | Documentation only changes | | style | Changes that do not affect the meaning of the code (white-space, formatting, etc) | | refactor | A code change that neither fixes a bug nor adds a feature | | perf | A code change that improves performance | | test | Adding missing tests or correcting existing tests | | chore | Changes to the build process or auxiliary tools and libraries |

Examples

Good:

  • feat(auth): implement jwt token validation
  • fix(search): handle empty result sets gracefully
  • docs(readme): update installation instructions

Bad:

  • update code
  • fix bug
  • wip

Workflow Rules

  1. Before Committing:

    • Check git status to see what will be staged.
    • Run git diff to review changes line-by-line.
    • Ensure sensitive data (API keys) is NOT included.

  2. Branching (if applicable):

    • main / master: Stable production code.
    • develop / dev: Integration branch.
    • feat/feature-name: Feature branches.
    • fix/issue-description: Bug fix branches.

  3. Handling Conflicts:

    • Pull changes from remote often to minimize conflicts.
    • Resolve conflicts manually, understanding both sides of the change.

Common Commands Checklist

| Action | Command | |--------|---------| | Check Status | git status | | View Changes | git diff | | Stage Files | git add <file> (Avoid git add . unless sure) | | Commit | git commit -m "type(scope): message" | | Log | git log --oneline --graph --decorate --all |

🔴 Self-Check Before Committing

Ask yourself:

  1. Does this commit break the build?
  2. Did I accidentally include node_modules, venv, or .env?
  3. Is the commit message descriptive enough for someone else to understand 6 months from now?
Related skills

Next.js App Router Expert

Development

A skill that turns Claude into a Next.js App Router expert.

Claude CodeCursoradvanced
890
234
2,846
Admin

README Generator

Development

Creates professional and comprehensive README.md files for your projects.

claudeCursorWindsurfbeginner
259
72
821
Admin

API Documentation Writer

Development

Generates comprehensive API documentation in OpenAPI/Swagger format.

claudeCursorWindsurfintermediate
156
44
682
Admin