Does it support Conventional Commits?

Yes, it enforces the Conventional Commits specification, requiring standardized types (feat, fix, refactor, etc.) and mandatory issue number references in every commit message.

Does this skill handle merge conflicts automatically?

It only resolves conflicts in auto-generated files like lock files (package-lock.json, etc.) where the resolution is unambiguous. All application code conflicts are flagged for human review.

What branching strategy does this skill use?

It implements a simplified Gitflow strategy using a 'main' branch for production, a 'develop' branch for integration, and short-lived feature, fix, or chore branches for active work.

How are branch names generated?

Branch names follow a strict format: / - . The type is inferred from issue labels such as bug, feature, or documentation.

Maverick Git Workflow

Name: Maverick Git Workflow
Author: thermiteau

bythermiteau

0•

Developer Tools

Standardizes repository management through a simplified Gitflow strategy, automated branch naming, and conventional commit enforcement.

This skill provides a comprehensive framework for managing Git operations within a development project. It implements a structured branching strategy using protected main and develop branches alongside strict naming conventions and conventional commit standards. By automating the derivation of branch names from issue types and providing clear protocols for merge conflict resolution and branch lifecycle management, it ensures repository consistency, improves team collaboration, and maintains a clean, machine-readable version history.

Key Features

01Automates branch lifecycle management including creation, rebasing, and post-merge cleanup

02Implements a simplified Gitflow strategy with protected production and integration branches

03Enforces the Conventional Commits specification for standardized git logs

040 GitHub stars

05Provides safety-first protocols for resolving conflicts in auto-generated files

06Automates branch naming based on issue types, numbers, and descriptions

Use Cases

01Automating the creation and management of feature, fix, and chore branches from Jira or GitHub issues

02Maintaining a clean and standardized Git history across a collaborative development team

03Enforcing commit message best practices to facilitate automated changelog generation

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add thermiteau/maverick-private mav-git-workflow

For use in Claude.ai and ChatGPT

Key Features

01Automates branch lifecycle management including creation, rebasing, and post-merge cleanup

02Implements a simplified Gitflow strategy with protected production and integration branches

03Enforces the Conventional Commits specification for standardized git logs

040 GitHub stars

05Provides safety-first protocols for resolving conflicts in auto-generated files

06Automates branch naming based on issue types, numbers, and descriptions

Use Cases

01Automating the creation and management of feature, fix, and chore branches from Jira or GitHub issues

02Maintaining a clean and standardized Git history across a collaborative development team

03Enforcing commit message best practices to facilitate automated changelog generation

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add thermiteau/maverick-private mav-git-workflow

For use in Claude.ai and ChatGPT