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

git-workflow

Enforces Git workflow standards covering commits, branching, merging, and conflict resolution.

1|Updated Mar 5, 2026
Search Tags:#git#code review#version control#conventional commits#semantic versioning#merge conflict#branching strategy
One-click install
npx skills add https://github.com/Clay-HHK/claude-skills --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-skills/tree/main/git-workflow
Command: npx skills add https://github.com/Clay-HHK/claude-skills --skill git-workflow-clay-hhk

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve? Teams often struggle with inconsistent commit messages, chaotic branch management, and painful merge conflicts. This Skill provides a complete Git workflow standard so every commit, branch, and release follows a consistent, traceable convention. ## Core Features & Use Cases - Conventional Commits Enforcement: Standardizes commit messages with types like feat, fix, docs, and refactor, including scope, body, and footer rules. - Branching Strategy: Defines master/develop/feature/bugfix/hotfix/release branch lifecycles with naming conventions and protection rules. - Merge & Conflict Guidance: Covers merge vs rebase decisions, --no-ff conventions, squash merges, and step-by-step conflict resolution. - Use Case: When starting a new feature, ask for the correct workflow and receive the exact branch creation, commit, rebase, pull request, and cleanup commands following team standards. ## Quick Start Create a feature branch for user management and commit my changes following Conventional Commits standards.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I write a Conventional Commits message?▼

Use the format type(scope): subject, where type is feat, fix, docs, refactor, perf, test, or chore. Start the subject with a verb, keep it under 50 characters, and omit the trailing period. Add a body and footer for breaking changes or issue references.

What Git branching strategy should a team use?▼

Use permanent master and develop branches plus short-lived feature, bugfix, hotfix, and release branches. Feature branches merge into develop via pull request, hotfixes branch from master and sync back to develop, and releases are tagged with semantic versions.

When should I use merge vs rebase in Git?▼

Use rebase to sync a private feature branch with the latest develop code for a linear history. Use merge --no-ff when merging feature branches into develop or master to preserve branch history. Never rebase public shared branches.

How do I resolve a Git merge conflict?▼

Run git status to find conflicting files, edit them to resolve the conflict markers, then git add the files and commit for merges or run git rebase --continue for rebases. Use git checkout --ours or --theirs to keep one side, or git merge --abort to cancel.

How do I fix a rejected git push?▼

Pull the latest remote changes first with git pull origin master, then push again. For a cleaner history, use git pull --rebase origin master before pushing. Avoid force pushes on shared branches; use --force-with-lease if a force push is truly needed.

Related Skills

Explore More Software Engineering Skills→
jacksonlee-twjacksonlee-tw

git-workflow

Automates Git feature branch creation, Conventional Commit staging, and GitLab push workflows.

Community
Intermediate
yocxy2yocxy2

land-and-deploy

Merge pull requests and verify production deployment health with canary checks.

Community
Advanced
Devsoul2026Devsoul2026
150

requesting-code-review

Automate pre-commit verification with static analysis, tests, and lint checks.

Community
Advanced
hung-phanhung-phan

trunk-based-development

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

Community
Advanced