skills.rest
Clay-HHK
Clay-HHKCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Provide standardized Git workflow guidance for commits, branching, merging, and tagging.

2|Updated Apr 12, 2026
Search Tags:#git#workflow#branching#commits#conflict-resolution#merge-strategy
One-click install
npx skills add https://github.com/Clay-HHK/claude-config --skill git-workflow-clay-hhk
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Clay-HHK/claude-config/tree/main/skills/git-workflow
Command: npx skills add https://github.com/Clay-HHK/claude-config --skill git-workflow-clay-hhk

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This skill provides a single source of truth for Git commit message standards, branch naming, merge strategies, tagging, and conflict resolution so teams can reduce merge conflicts, improve traceability, and maintain reliable CI/CD pipelines.

Core Features & Use Cases

  • Commit message standards: Clear Conventional Commits format, subject rules, scope guidance, and examples to enable consistent changelogs and automated tooling.
  • Branch management & workflows: Defined branch types (master, develop, feature, bugfix, hotfix, release), naming conventions, lifecycle rules, and branch protection recommendations to streamline team development.
  • Merge, rebase, and conflict resolution: Recommended tactics (rebase for sync, merge --no-ff for integration), conflict handling steps, and prevention best practices to keep history meaningful and resolve issues quickly.
  • Release and tagging guidance: Semantic versioning, annotated tags, and release branch procedures to support reproducible releases and changelog generation. Use case example: When preparing v1.0.0, create a release branch from develop, update versions and changelog, merge to master with a tag, and sync changes back to develop following the documented conventions.

Quick Start

Use the git-workflow skill to create a feature branch named feature/user-management, craft a Conventional Commits message for your changes, push the branch to origin, and open a pull request for review.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is the best way to structure Git commit messages for automated changelogs?▼

Use the Conventional Commits format for Git commit messages to enable consistent changelogs and automated tooling. This standard provides clear subject rules, scope guidance, and structured examples for team software development.

How do I manage Git branches for feature development and hotfixes?▼

Manage Git branches by defining branch types like master, develop, feature, bugfix, hotfix, and release. Apply naming conventions, lifecycle rules, and branch protection recommendations to streamline team development workflows.

When should I use Git merge --no-ff vs rebase for conflict resolution?▼

Use Git rebase to sync branches and merge --no-ff for integration to keep history meaningful. Follow documented conflict handling steps and prevention best practices to resolve merge conflicts quickly and maintain reliable CI/CD pipelines.

How do I prepare a Git release branch and apply semantic version tagging?▼

Create a release branch from develop, update versions and changelog, then merge to master with an annotated semantic version tag. Finally, sync changes back to develop following documented release branch procedures for reproducible releases.

What are the standard branch protection rules for CI-protected Git workflows?▼

Standard branch protection rules for CI-protected Git workflows include establishing defined branch types, enforcing naming conventions, and applying lifecycle rules. These recommendations safeguard master and develop branches during team software development.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
marquesfelipmarquesfelip

automated-versioning

Automate semantic version bumps from conventional commits in CI/CD pipelines.

Community
Advanced
geoffjaygeoffjay
8

git-conventions

Enforce conventional commit formats and standardized branch naming patterns.

Community
Basic
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced