branch-strategy

branch-strategy is a skill for Claude Code, Codex from bdiasti/maestro-bundle-cli. It costs 31 tokens per session (1,074 once invoked), scanned A, original, MIT.

A guide to creating and managing Git branches according to an organisation’s branching strategy. A branch is a separate line of code changes used for work such as features, fixes or releases.

In plain words
What is it for?
It helps create feature, fix, hotfix and release branches, prepare branches for merge requests, resolve conflicts, and set up isolated worktrees.
Why use it?
It helps keep development, production and release work organised and reduces mistakes when changes are merged.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Needs its repository: it reads a path above its own folder, which exists only inside the repository. The line is git worktree add ../agent-frontend-workspace feature/agent-frontend-<task-id>.

Good fit It helps create feature, fix, hotfix and release branches, prepare branches for…

Compare 6 skills from other repositories ↓
Install

Getting it into your agent

It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.

Clone the repo
git clone --depth 1 https://github.com/bdiasti/maestro-bundle-cli
agentmods
npx agentmods add skills/bdiasti/maestro-bundle-cli/branch-strategy

Made for: Claude Code, Codex.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for branch-strategy

README.md
[![agentmods](https://agentmods.dev/badge/skills/bdiasti/maestro-bundle-cli/branch-strategy.svg)](https://agentmods.dev/skills/bdiasti/maestro-bundle-cli/branch-strategy)
Your own site
<a href="https://agentmods.dev/skills/bdiasti/maestro-bundle-cli/branch-strategy"><img src="https://agentmods.dev/badge/skills/bdiasti/maestro-bundle-cli/branch-strategy.svg" alt="Measured on agentmods" height="20"></a>
Per session 31 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,074 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00031 $0.01074
Opus 5 $0.00015 $0.00537
Sonnet 5 $0.00006 $0.00215
Haiku 4.5 $0.00003 $0.00107

Measured 7d ago against content hash 1a50cc558c79, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-06, from the pricing page.

Security

Grade A, and why

branch-strategy scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 7d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

templates/bundle-base/skills/branch-strategy/SKILL.md · 156 lines

How it starts

The opening of the file, as written. The whole thing — 156 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Branch Strategy

Create and manage Git branches following the Maestro branching strategy with permanent and temporary branches.

When to Use

  • When creating a new feature branch
  • When starting a bug fix or hotfix
  • When preparing a release
  • When merging branches or resolving conflicts
  • When setting up agent worktrees

Available Operations

  1. Create a feature branch
  2. Create a fix/hotfix branch
  3. Create a release branch
  4. Rebase and prepare for merge request
  5. Set up agent worktree with isolated branch

Multi-Step Workflow

Step 1: Identify Branch Type

Pattern Example Origin Target
feature/<module>-<desc> feature/demands-auto-decompose develop develop
fix/<module>-<desc> fix/agents-timeout-skill develop develop
hotfix/<desc> hotfix/fix-login-crash main main + develop
release/<version> release/1.2.0 develop main + develop

Permanent branches:

Branch Purpose Protection
main Production code Protected, merge only via approved MR
develop Feature integration Protected, MR with 1+ reviewer

Step 2: Create the Branch

# Feature branch
git checkout develop
git pull origin develop
git checkout -b feature/demands-auto-decompose

# Fix branch
git checkout develop
git pull origin develop
git checkout -b fix/agents-timeout-skill

# Hotfix branch (from main)
git checkout main
git pull origin main
git checkout -b hotfix/fix-login-crash

# Release branch
git checkout develop
git pull origin develop
git checkout -b release/1.2.0

Step 3: Work and Commit

Follow the commit-pattern skill for commit messages.

git add <files>
git commit -m "feat(demands): adicionar decomposicao automatica de tasks"

Step 4: Rebase Before Merge Request

git fetch origin
git rebase origin/develop
# Resolve conflicts if any, then:
git rebase --continue

Step 5: Push and Create Merge Request

Read the full file on GitHub · 156 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 7d ago First seen · 156 lines · 31 tokens per session scan A 1a50cc558c79

Subscribe to this mod's changes

branch-strategy is a skill published in the GitHub repository bdiasti/maestro-bundle-cli (21 stars, last pushed 5mo ago), licensed MIT. It adds 31 tokens to every session and 1,074 once invoked, about $0.0002 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

prowler-commit

Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.

prowler-cloud/prowler · 33 tokens

gh-auth-isolation

Safely manage multiple GitHub identities (EMU + personal) in agent workflows.

github/gh-aw · 20 tokens

comet-github

A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.

rpamis/comet · 72 tokens

github-skill

Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.

zeenie-ai/OpenCompany · 51 tokens

codex-autoresearch

Run autonomous, measurable experiments in a Git repository: change one hypothesis, verify a numeric metric, keep improvements, and revert failures. Use when the user wants Codex to keep iterating toward a numeric target in the foreground or as a detached background run. Do not use for ordinary one-shot coding…

leo-lilinxiao/codex-autoresearch · 80 tokens

changelog-composer

Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".

Mathews-Tom/armory · 67 tokens