Git Workflow Strategy

aj-geddes/useful-ai-prompts/skills/git-workflow-strategy

by aj-geddes3f5182cfd739No license355 starsListed Oct 8, 2026Updated Oct 8, 2026Repository updated 7 months ago

Master Git workflows including GitFlow, GitHub Flow, Trunk-Based Development. Configure branches, merge strategies, and collaboration patterns for team environments.

Includes scriptsDevOps & Cloud

AI-generated overview

Guides teams in choosing and configuring Git branching workflows such as GitFlow, GitHub Flow and Trunk-Based Development.

What it does: This skill provides guidance on establishing Git workflows for team collaboration, covering branching strategies, merge patterns, release management and hotfix procedures. It includes reference guides on GitFlow setup, merge strategy scripting and code-review collaboration, plus a validation script and a pipeline template. It produces workflow recommendations and configuration guidance rather than application code.
When to use it: Use it when setting up or revising a team's Git branching and release process, coordinating feature development, or planning CI/CD integration around code review and merge rules.
Requirements: Requires Git and, for the GitFlow examples, the git-flow extension; ships an executable validation script and a pipeline template.

Overview

Establish efficient Git workflows that support team collaboration, code quality, and deployment readiness through structured branching strategies and merge patterns.

When to Use

Team collaboration setup
Release management
Feature development coordination
Hotfix procedures
Code review processes
CI/CD integration planning

Quick Start

Minimal working example:

bash

# Initialize GitFlowgit flow init -d
# Start a featuregit flow feature start new-feature# Work on featuregit add .git commit -m "feat: implement new feature"git flow feature finish new-feature
# Start a releasegit flow release start 1.0.0# Update version numbers, changeloggit add .git commit -m "chore: bump version to 1.0.0"git flow release finish 1.0.0
# Create hotfixgit flow hotfix start 1.0.1# Fix critical buggit add .git commit -m "fix: critical bug in production"git flow hotfix finish 1.0.1

# Initialize GitFlowgit flow init -d
# Start a featuregit flow feature start new-feature# Work on featuregit add .git commit -m "feat: implement new feature"git flow feature finish new-feature
# Start a releasegit flow release start 1.0.0# Update version numbers, changeloggit add .git commit -m "chore: bump version to 1.0.0"git flow release finish 1.0.0
# Create hotfixgit flow hotfix start 1.0.1# Fix critical buggit add .git commit -m "fix: critical bug in production"git flow hotfix finish 1.0.1

Reference Guides

Detailed implementations in the references/ directory:

Guide	Contents
GitFlow Workflow Setup [blocked]	GitFlow Workflow Setup, GitHub Flow Workflow, Trunk-Based Development, Git Configuration for Workflows (+1 more)
Merge Strategy Script [blocked]	Merge Strategy Script
Collaborative Workflow with Code Review [blocked]	Collaborative Workflow with Code Review

Best Practices

✅ DO

Choose workflow matching team size and release cycle
Keep feature branches short-lived (< 3 days)
Use descriptive branch names with type prefix
Require code review before merging to main
Enforce protection rules on main/release branches
Rebase frequently to minimize conflicts
Write atomic, logical commits
Keep commit messages clear and consistent

❌ DON'T

Commit directly to main branch
Create long-lived feature branches
Use vague branch names (dev, test, temp)
Merge without code review
Mix multiple features in one branch
Force push to shared branches
Ignore failing CI checks
Merge with merge commits in TBD

Source and attribution

Source:aj-geddes/useful-ai-promptsinskills/git-workflow-strategyat commit3f5182c

License: No license

Content belongs to its original authors. SourceWeft indexes it from a public repository.

Report or request removal

Git Workflow Strategy

Git Workflow Strategy

Table of Contents

Overview

When to Use

Quick Start

Reference Guides

Best Practices

✅ DO

❌ DON'T

Source and attribution

More from aj-geddes/useful-ai-prompts

Xss Prevention

Wireframe Prototyping

Web Performance Optimization

Vue Application Structure

Visual Regression Testing

User Persona Creation

More in DevOps & Cloud

Playwright Devops

M5 Onboard

Yeet

Runbook

Incident Response

Deploy Checklist