git-workflow

Atman36's avatarfrom Atman36

Git best practices for commits, branches, pull requests, and collaboration workflows following Conventional Commits and GitFlow patterns

⭐5stars🔀1forks📁View on GitHub🕐Updated Nov 3, 2025

When & Why to Use This Skill

This Claude skill optimizes version control processes by implementing professional Git workflows, including Conventional Commits and GitFlow patterns. It helps developers maintain a clean commit history, manage branches effectively, and streamline collaboration through standardized practices for commits, pull requests, and releases.

Use Cases

  • Standardizing commit messages: Automatically formatting commits using the Conventional Commits specification (e.g., feat, fix, docs) to improve project traceability and automated changelog generation.
  • Branch management: Applying GitFlow strategies to systematically organize feature development, integration, production releases, and urgent hotfixes.
  • Pre-commit validation: Implementing security and quality checklists to scan for secrets and run linting/testing before code is committed to the repository.
  • Collaboration workflows: Streamlining the Pull Request (PR) process by enforcing consistent branch naming conventions and structured communication for team-based development.
namegit-workflow
descriptionGit best practices for commits, branches, pull requests, and collaboration workflows following Conventional Commits and GitFlow patterns
version1.0.0
authorAI-Vibe-Prompts
tags[git, workflow, version-control, collaboration, conventional-commits]
auto_invoketrue

Git Workflow Skill

Objective

Implement professional Git workflows ensuring clean commit history, proper branch management, effective collaboration, and code review best practices.

When to Use This Skill

Auto-invoke when:

  • User mentions "commit", "push", "branch", "merge", "pull request", "PR"
  • Before code changes need to be saved
  • Preparing for deployment or release
  • Resolving merge conflicts

Commit Message Standards (Conventional Commits)

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

Types: feat, fix, docs, style, refactor, perf, test, chore, ci

Examples:

feat(auth): add OAuth2 login support
fix(api): handle null response in user endpoint
docs(readme): update installation instructions

Branch Naming: <type>/<ticket-id>-<description>

Examples:

feature/AUTH-123-oauth-integration
bugfix/CORE-456-fix-null-pointer
hotfix/PROD-789-critical-security-patch

GitFlow Workflow

Main: production, Develop: integration Features: branch from develop → merge to develop Releases: branch from develop → merge to main+develop Hotfixes: branch from main → merge to main+develop

Pre-Commit Checklist

# No secrets
git diff --cached | grep -iE "api[_-]?key|secret|password"

# Run quality gates
npm run lint && npm run typecheck && npm run test

Version History

  • 1.0.0 (2025-01-03): Initial Git workflow skill