How does this skill handle branch naming?

It enforces a standard / format, using lowercase and hyphens for types like feature, fix, hotfix, refactor, and chore.

Is this skill language-specific?

No, it is a universal, language-agnostic tool designed to work across any software project regardless of the programming language used.

Can this skill help resolve merge conflicts?

Yes, it provides a structured 5-step process for resolving conflicts, including syncing with the main branch, staging resolved files, and verifying via tests.

What is the benefit of the AI-optimized YAML format?

The skill includes YAML versions of its standards to reduce token usage, allowing Claude to process workflow rules faster and more accurately.

Which Git strategies does this skill support?

It supports GitHub Flow for continuous delivery, GitFlow for scheduled releases, and Trunk-Based Development for high-frequency deployment environments.

Git Workflow Guide

Name: Git Workflow Guide
Author: AsiaOstrich

byAsiaOstrich

•

Productivity & Workflow

Standardizes Git branching strategies, naming conventions, and merge operations to maintain clean and collaborative codebases.

The Git Workflow Guide skill empowers Claude to act as a version control expert, providing structured guidance on selecting the best branching strategy for your project—whether it's GitHub Flow, GitFlow, or Trunk-Based Development. It enforces strict branch naming conventions and offers step-by-step instructions for complex merge operations and conflict resolution. By utilizing token-efficient YAML configurations, this skill ensures that development teams maintain a consistent, professional repository structure while minimizing technical debt and streamlining the pull request process.

Key Features

01Automated branch naming validation and suggestions

02Pre-branching safety checklists and sync procedures

03Step-by-step merge conflict resolution guides

0440 GitHub stars

05Dynamic workflow selection based on deployment frequency

06AI-optimized standards for token-efficient collaboration

Use Cases

01Establishing a standardized Git strategy for a new software project

02Managing complex code merges and release preparation phases

03Enforcing consistent branch naming across a distributed development team

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add asiaostrich/universal-dev-standards git-workflow-guide

For use in Claude.ai and ChatGPT

Key Features

01Automated branch naming validation and suggestions

02Pre-branching safety checklists and sync procedures

03Step-by-step merge conflict resolution guides

0440 GitHub stars

05Dynamic workflow selection based on deployment frequency

06AI-optimized standards for token-efficient collaboration

Use Cases

01Establishing a standardized Git strategy for a new software project

02Managing complex code merges and release preparation phases

03Enforcing consistent branch naming across a distributed development team

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add asiaostrich/universal-dev-standards git-workflow-guide

For use in Claude.ai and ChatGPT