Does it require any external CLI tools?

While core Git features work natively, full PR automation is designed to leverage the GitHub CLI (gh) for creating descriptions and managing reviews.

How does it handle merge conflicts?

The skill provides a guided conflict resolution workflow that helps users choose between local and remote changes or perform manual edits when merging main into feature branches.

Why does this skill use a specific branch naming convention?

The 'claude/' prefix and session ID format prevent naming collisions with human developers and allow for easy tracking of changes back to specific AI development sessions.

How does the push retry logic work?

It implements an exponential backoff script that attempts to push code multiple times, increasing the delay between attempts to overcome temporary server or network issues automatically.

Can I use this for projects with multiple repositories?

Yes, the skill includes specialized scripts to coordinate branch creation, batch commits, and pushes across multiple repositories simultaneously.

Claude Git Branching Manager

Name: Claude Git Branching Manager
Author: jackspace

byjackspace

•

開発者ツール

Optimizes Git workflows for AI-assisted development by automating branch naming, push retries, and pull request creation within Claude Code sessions.

Claude Git Branching is a specialized skill designed to bridge the gap between AI-driven code generation and professional version control standards. It implements a standardized branching convention that prevents conflicts with human contributors, ensures reliable pushes through exponential backoff retry logic, and streamlines the handoff process with automated, detail-rich pull requests. Whether you are managing complex features across multiple repositories or navigating session-based development, this skill provides the automation and guardrails necessary for a robust, conflict-free Git strategy optimized specifically for Claude Code users.

主な機能

01Intelligent pull request automation including summary generation and test plans.

02Conflict resolution workflows tailored for AI-assisted merge scenarios.

03Multi-repository synchronization for coordinated cross-service development.

04Automated push retry logic with exponential backoff for high reliability.

05Standardized Claude-specific branch naming conventions with session tracking.

062 GitHub stars

ユースケース

01Ensuring reliable code pushes in unstable network environments using automated retry scripts.

02Managing feature branches across multiple sequential Claude Code development sessions.

03Creating professional, team-ready pull requests directly from the Claude Code CLI.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jackspace/claudeskillz claude-git-branching

For use in Claude.ai and ChatGPT

Download Skill