git-workflow

The 'git-workflow' skill provides a structured guide to managing Git version control in team environments, addressing common challenges in collaborative development. It helps teams adopt consistent branching strategies, maintain clear commit histories, and efficiently resolve conflicts. By defining best practices for workflows such as GitHub Flow, Trunk-Based Development, and GitFlow, this skill ensures teams can maintain high code quality while supporting various deployment and release cadences. It targets developers, teams, and organizations aiming to streamline Git usage, enforce conventions, and reduce errors during merges and releases.

This skill covers several key capabilities, including the selection and application of branching strategies suitable for different team sizes and project types. It details rules for creating feature, release, and hotfix branches, along with guidance on continuous integration and deployment practices. Additionally, it standardizes commit messages using the Conventional Commits format, providing types, examples, and templates to promote clarity and traceability. By illustrating both good and bad commit practices, it equips developers to write descriptive, actionable messages, which improves code reviews, troubleshooting, and release tracking.

Use cases include setting up Git workflows for new projects, deciding on branching strategies, writing consistent commit messages, resolving merge conflicts, and onboarding new team members to standardized Git practices. The skill is particularly useful for teams of all sizes, from small startups using GitHub Flow to large enterprises requiring GitFlow for scheduled releases. Its guidance helps maintain code quality, supports rapid deployment cycles, and ensures team alignment around version control processes.