skills.rest
EdanStarfire
EdanStarfireCOMMUNITY
Explore all skills by this author →
GitHub

git-branch-manager

Create, switch, and clean up git branches while preserving uncommitted changes.

15|1|Updated Sep 13, 2025
Search Tags:#git#workflow#version control#cleanup#branch#stash#management
One-click install
npx skills add https://github.com/EdanStarfire/claudecode_webui --skill git-branch-manager
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-branch-manager
Source: https://github.com/EdanStarfire/claudecode_webui/tree/main/.claude/skills/git-branch-manager
Command: npx skills add https://github.com/EdanStarfire/claudecode_webui --skill git-branch-manager

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill streamlines Git branch operations, ensuring proper naming conventions, safe switching between contexts, and efficient cleanup after merges, preventing common version control headaches and keeping your repository tidy.

Core Features & Use Cases

  • Smart Branch Creation: Create new feature, fix, or chore branches from an up-to-date main with proper naming conventions (e.g., feat/add-user-auth).
  • Safe Branch Switching: Handle uncommitted changes gracefully (by offering to stash or commit) before switching branches, preventing data loss or conflicts.
  • Merged Branch Cleanup: Easily identify and delete local branches that have already been merged into main, keeping your local repository clean.
  • Use Case: Before starting a new task, use this Skill to create a new feat/ branch from an updated main, ensuring your work is isolated and follows project standards, then later clean it up once merged.

Quick Start

Create a new feature branch named "add-user-settings" from the latest main branch, ensuring any uncommitted changes are handled first.

Frequently Asked Questions about git-branch-manager

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I safely switch between Git branches with uncommitted changes?▼

Safe branch switching handles uncommitted changes by offering to stash or commit them before switching, preventing data loss. This Skill automates the process, ensuring your work is preserved while you move between branches.

What's the best way to clean up merged Git branches from my local repository?▼

Identify and delete local branches already merged into main using safe-deletion checks that prevent accidental removal of unmerged work. This Skill automates cleanup to keep your repository tidy after merges.

How do I create a new feature branch with proper naming conventions?▼

Create branches with enforced kebab-case naming and prefixes like feat/, fix/, or chore/ from an up-to-date main branch. This Skill ensures your branches follow project standards and isolate work properly.

Can I automate Git branch management across my collaborative workflow?▼

Automate branch creation, switching, and cleanup with repository-state validation and uncommitted-change handling. This Skill applies throughout feature, bugfix, and maintenance branch workflows in team repositories.

Do I need to manually handle stashing before switching Git branches?▼

No—this Skill handles stashing or committing uncommitted changes automatically before switching branches, eliminating manual steps and reducing context-switch friction.

Related Skills

Explore More Software Engineering Skills→
cacr92cacr92
4

merge-main-cleanup

Merge the current Git branch into main and prune all other branches.

Community
Advanced
TioSavichTioSavich

ship

Merge base branch, run tests, bump version, update changelog, commit, push, and create a pull request.

Community
Advanced
heyAyushhheyAyushh
3

commit-push

Stage all changes, commit with conventional prefixes, and push to the current branch.

Community
Basic
AmidVoshakulAmidVoshakul

git-advanced-workflows

Optimize Git history via interactive rebasing, cherry-picking, and automated bisecting.

Community
Advanced