Skip to content
cccskills
FreePublished on GitHub

branch-workflow

Branch and commit conventions that keep an agent's work reviewable — one branch per task, main stays clean, nothing force-pushed.

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md2.4 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Branch Workflow - Safe Autonomous Coding

All work happens on branches. Main stays clean. The user reviews before merge.

Branch Naming

feat/TASK-ID-short-description    # New features
fix/TASK-ID-short-description     # Bug fixes
docs/TASK-ID-short-description    # Documentation
research/TASK-ID-description      # Exploration
refactor/TASK-ID-description      # Code improvements

Examples:

  • feat/API-142-rate-limiting
  • fix/WEB-87-login-redirect
  • docs/API-150-auth-guide

Commit Format

TASK-ID: Brief description of change

- Detail 1
- Detail 2

Co-Authored-By: Claude <co-author>

Good commits:

  • Atomic (one logical change)
  • Buildable (tests pass at each commit)
  • Descriptive (explains what, not how)

Workflow

Starting Work

git checkout main
git pull origin main
git checkout -b feat/TASK-ID-description

During Work

# Commit often
git add -A
git commit -m "TASK-ID: Implement X"

# Push periodically
git push -u origin feat/TASK-ID-description

Finishing Work

# Ensure tests pass
cargo test  # or npm test, pytest, etc.

# Push final state
git push

# Log completion (megg or BACKLOG.md)

Rules

NEVER Do

  • Push directly to main
  • Force push (git push --force)
  • Merge your own branches
  • Delete branches without the user's approval
  • Commit secrets or credentials

ALWAYS Do

  • Create branch before changing code
  • Run tests before pushing
  • Commit with clear messages
  • Push branches for review
  • Document decisions

When Blocked

  1. Push current work to branch
  2. Document blocker in .megg/blocked.md or commit message
  3. Move to next task
  4. The user will review on return

Review Workflow

The user reviews branches by:

# See all work
git branch -a

# Review specific branch
git log main..feat/BRANCH-NAME
git diff main..feat/BRANCH-NAME

# Merge if good
git checkout main
git merge feat/BRANCH-NAME

Integration with OpenSpec

For OpenSpec changes:

  • Branch name matches change ID: feat/add-plugin-system
  • One branch per OpenSpec change
  • Archive OpenSpec change only after merge

Emergency Fixes

For critical bugs in production:

  1. Create hotfix/description branch
  2. Minimal fix only
  3. Tests must pass
  4. Document urgency in commit
  5. Flag for immediate user review

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Look up how Claude Code itself works — hooks, skills, subagents, MCP, plugins, settings — from the official docs, so answers come from the current spec instead of memory.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

Design better agents, skills and hooks for Claude Code, checking the current spec instead of guessing at fields.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

Run a feature end to end — scout the code, plan it, build it, and keep a session file so a closed terminal doesn't lose the thread.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

Close out a session — summarise what changed, capture what was learned, and prepare the commit.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

Hand over a spec and walk away — plans, builds, tests and audits on its own, stopping only at a real blocker.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

dev-qa

Free

Run the project's own tests, linter, type checker and build, and report what actually failed.

The English summary is being prepared. Showing the original description.

ToruAI/toru-claude-agents15Updated Jul 26, 2026

See all skills by ToruAI

Report a problem with this skill