skills.rest
pfangueiro
pfangueiroCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Standardize Git commits, branching, pull requests, and hooks.

6|Updated Aug 4, 2025
Search Tags:#git#workflow#best practices#version control#branching#pull requests#code collaboration
One-click install
npx skills add https://github.com/pfangueiro/claude-code-agents --skill git-workflow-pfangueiro
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/pfangueiro/claude-code-agents/tree/main/.claude/skills/git-workflow
Command: npx skills add https://github.com/pfangueiro/claude-code-agents --skill git-workflow-pfangueiro

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill eliminates inconsistent Git usage, reduces merge conflicts, and improves overall code collaboration by standardizing best practices. It helps teams maintain a clean, understandable commit history and efficient development cycles.

Core Features & Use Cases

  • Standardized Commit Messages: Guides you in crafting clear, semantic commit messages following Conventional Commits.
  • Branching Strategies: Provides expert guidance on Git Flow, GitHub Flow, and Trunk-Based Development to suit your project needs.
  • Pull Request Best Practices: Offers a checklist for effective code reviews and conflict resolution, ensuring high-quality merges.
  • Use Case: A new developer joins your team and needs to quickly adopt your project's Git standards. This Skill provides all the necessary guidelines, from commit messages to branching, ensuring they contribute effectively from day one.

Quick Start

Help me write a conventional commit message for a new feature that adds user authentication.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I write conventional commit messages for my Git workflow?▼

Conventional commits follow a standardized format: type(scope): description. Common types include feat for features, fix for bugs, and docs for documentation. This format creates a clear, semantic commit history that tools can parse automatically for versioning and changelog generation.

What's the best branching strategy for my team's Git workflow?▼

Three main strategies suit different team sizes and release cadences: Git Flow uses feature and release branches for structured workflows; GitHub Flow keeps a single main branch with short-lived feature branches for continuous delivery; Trunk-Based Development commits directly to main with feature flags. Choose based on your release frequency and team size.

How do I reduce merge conflicts in pull requests?▼

Merge conflicts arise from overlapping changes. Minimize them by keeping branches short-lived, pulling main frequently, dividing work across files, and using Git's conflict resolution tools. Clear pull request guidelines and code review checklists catch issues early before merges.

Can I automate Git workflow checks across my team?▼

Yes, use Git hooks and CI/CD integration to enforce standards automatically. Pre-commit hooks validate commit message formatting and code quality locally; CI/CD pipelines run checks on pull requests. Combined with PR templates and review checklists, automation ensures consistent practices without manual enforcement.

When should a new developer follow my project's Git standards?▼

Standards should be adopted from day one. Document branching strategy, commit message conventions, and PR review process in a contributor guide. Git hooks and CI/CD checks enforce compliance automatically, so new developers learn the pattern through immediate feedback rather than manual correction.

How do I handle hotfixes in my branching strategy?▼

Hotfix workflows vary by strategy: Git Flow isolates hotfixes on dedicated branches from release branches; GitHub Flow and Trunk-Based Development merge fixes directly to main via pull requests. All approaches require hotfixes to be tagged for release and backported to in-progress branches to prevent regression.

Related Skills

Explore More Software Engineering Skills→
jralphjralph

git-workflow

Enforce Conventional Commits, pre-commit hooks, and semantic versioning in Git workflows.

Community
Intermediate
SPeeDoA1SPeeDoA1
6

git-release

Automate version bumps, changelog generation, and git tagging for releases.

Community
Advanced
HomericIntelligenceHomericIntelligence
18

verify-pr-ready

Validate GitHub Pull Requests for CI status, approvals, and merge conflicts.

Official
Intermediate
phucle297phucle297

caveman-commit

Generate concise conventional commit messages for Git repositories.

Community
Intermediate