git-workflow

Enforce Git branching, pull request, and release workflows for GitHub or GitLab.

Updated Mar 1, 2026

Search Tags:#git #collaboration #branching #pull-request #semantic-versioning #git-hooks #merge-strategy

One-click install

npx skills add https://github.com/CloudyWing/ai-dotfiles --skill git-workflow-cloudywing

Or copy as Structured Prompt for Agent▼

Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/CloudyWing/ai-dotfiles/tree/main/skills/git-workflow
Command: npx skills add https://github.com/CloudyWing/ai-dotfiles --skill git-workflow-cloudywing

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Inconsistent branch naming, oversized or unclear pull requests, and mixed merge practices lead to confusing history, failed CI, and slower collaboration; this Skill provides a clear, enforceable set of conventions to prevent those issues and speed up reviews and releases.

Core Features & Use Cases

Branching strategy: Clear guidance for main, develop, and feature branches, including naming patterns and when to use GitHub Flow versus Git Flow.
Pull Request standards: PR title and description templates, size and scope guidance, use of Draft PRs, and recommended self-review steps to keep reviews focused and actionable.
Merge and release policies: Recommended merge strategies (squash for features, merge commits for releases/hotfixes, rebase for local sync), conflict handling steps, git hooks guidance, and semantic version tagging practices.
Use case: Teams preparing for continuous delivery or scheduled releases can apply these rules to ensure CI stability, predictable changelogs, and safer collaboration.

Quick Start

Use the git-workflow skill to audit a repository and generate branch naming rules, a PR template, and a recommended merge strategy.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

How do I standardize Git branching and pull request workflows for my team?▼

Standardize Git branching and pull request workflows by enforcing naming patterns for feature branches, applying PR title and description templates, and defining merge strategies to ensure consistent history and faster code reviews.

What is the best merge strategy for feature branches and release hotfixes?▼

The best merge strategy uses squash merges for feature branches to keep history clean, standard merge commits for releases or hotfixes, and rebase for syncing local branches with the main repository.

How do you resolve Git merge conflicts during a pull request code review?▼

Resolve Git merge conflicts during pull request reviews by pulling the latest target branch, rebasing the feature branch locally, addressing conflict markers, and pushing the resolved changes before final approval.

How do I set up semantic version tagging and git hooks for continuous delivery?▼

Set up semantic version tagging on the main branch alongside recommended git hooks to automate checks, ensuring predictable changelogs and safer continuous delivery releases for your repository.

When should I use GitHub Flow versus Git Flow for feature development?▼

Use GitHub Flow for continuous delivery with a single main branch, and choose Git Flow when managing separate develop and release branches for scheduled versioned releases.

Does this Git workflow convention work with both GitHub and GitLab repositories?▼

Yes, this Git workflow convention applies to teams using GitHub or GitLab, standardizing branch naming, PR templates, and merge strategies across both platforms during feature development and releases.