# Branch Management

> Review and guide branch strategy when creating PRs, merging, or creating branches involving main, develop, and release branches Use when this capability is needed.

- Skill: `tomevault-io/branch-management-2` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add tomevault-io/branch-management-2`
- Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/branch-management-2/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: tomevault-io (https://skillmd.com/u/tomevault-io)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/tomevault-io/branch-management-2

---


# Branch Management

main/develop への直接 push を防ぐため、work branch → release/* → develop → main の順に PR でマージする。

## Rules

| 操作 | 許可 | 禁止 |
|------|------|------|
| main 変更 | develop からの PR merge のみ | 直接 push、他ブランチからの merge |
| develop 変更 | release/* からの PR merge のみ | 直接 push |
| release/* 作成 | develop から分岐 | main や work branch から分岐 |
| work branch 作成 | release/* から分岐 | main や develop から分岐 |

## Procedures

```bash
# Work branch 作成
git checkout release/vX.Y.Z && git checkout -b feature/my-feature

# PR 作成
gh pr create --base release/vX.Y.Z   # work → release
gh pr create --base develop           # release → develop
gh pr create --base main              # develop → main

# Merge (CI pass 後)
gh pr merge --squash   # work → release (履歴クリーン)
gh pr merge --merge    # release → develop / develop → main (履歴保持)
```

## Branch Naming

`feature/*` (新機能) / `fix/*` (バグ修正) / `refactor/*` (リファクタ) / `docs/*` (ドキュメント) / `release/vX.Y.Z` (リリース)

リリースフロー全体は `/release-procedure`、CI は `/local-ci` を参照。

---
> Converted and distributed by [TomeVault](https://tomevault.io/claim/tettuan) — claim your Tome and manage your conversions.
<!-- tomevault:4.0:skill_md:2026-04-13 -->