Why is the Branch Discipline skill necessary?

It prevents the AI from making direct changes to your main branch, which protects your production code and ensures all work is peer-reviewed via Pull Requests.

What happens if Claude tries to work on the main branch?

The skill acts as a 'hard gate,' triggering an error and forcing the creation of a new feature branch before any code modifications can proceed.

Can it handle dependent branches?

Yes, it includes logic for creating new feature branches from existing ones when building on in-progress work that hasn't been merged yet.

How does it handle branch cleanup after a merge?

The skill provides specific procedures to switch back to main, pull the latest changes, and safely delete both local and remote feature branches.

Does this skill support different types of work?

Yes, it supports multiple branch types including feature, fix, chore, docs, refactor, and test, each with a specific naming convention.

Branch Discipline

Name: Branch Discipline
Author: troykelly

bytroykelly

0•

Developer Tools

Enforces a strict feature-branch workflow by preventing direct commits to protected branches and standardizing branch naming.

Branch Discipline acts as a critical safety gate for autonomous development, ensuring that no code changes are ever performed directly on the main or master branches. It mandates a structured git workflow where every task is isolated in a properly named feature branch (e.g., feature/issue-123-title). By automating the checks for the current branch state and providing clear paths for branch creation, rebasing, and cleanup, this skill maintains a clean, professional commit history and prevents accidental corruption of production-ready code.

Key Features

01Guided branch lifecycle management from creation to post-merge deletion

02Automated branch creation from correct base branches with remote tracking

030 GitHub stars

04Standardized naming conventions for features, fixes, chores, and docs

05Hard gate logic that blocks code changes on protected branches

06Built-in verification scripts to validate branch names and state

Use Cases

01Automating the setup of issue-specific branches for traceable development

02Enforcing a 'GitHub Flow' or 'GitFlow' methodology during autonomous coding

03Preventing accidental direct commits to main/master branches in CI/CD environments

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add troykelly/claude-skills branch-discipline

For use in Claude.ai and ChatGPT

Download Skill