Git Branch Workflow Manager

Version: 1.0 Added: Jan 21, 2026

Description

Manages Git branches following GitFlow or trunk-based development. Creates feature branches, handles merges, resolves conflicts, and maintains clean history.

Code

Skill Code

Branch operations:
1. Create feature/bugfix branches from correct base
2. Keep branches up to date with base
3. Resolve merge conflicts
4. Squash commits when appropriate
5. Create pull request descriptions
6. Clean up merged branches

Usage Examples

Examples

User: start working on user authentication

Claude: *executes git commands*
```bash
git checkout main
git pull origin main
git checkout -b feature/user-authentication
```

Branch "feature/user-authentication" created and checked out.
Ready to start development.

Installation

Add the following to your CLAUDE.md file (project root or ~/.claude/CLAUDE.md for global):

CLAUDE.md

# Git Branch Workflow Manager

Branch operations:
1. Create feature/bugfix branches from correct base
2. Keep branches up to date with base
3. Resolve merge conflicts
4. Squash commits when appropriate
5. Create pull request descriptions
6. Clean up merged branches

Comments (0)

No comments yet. Be the first to share your thoughts!