skills.rest
apuya
apuyaCOMMUNITY
Explore all skills by this author →
GitHub

version-control

Manages git branch naming, version tracking, and branch lifecycle workflows.

Updated Nov 20, 2025
Search Tags:#git#workflow#version control#release#conventions#branch naming#branch cleanup
One-click install
npx skills add https://github.com/apuya/react-basics-ui --skill version-control-apuya
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: version-control
Source: https://github.com/apuya/react-basics-ui/tree/main/.claude/skills/version-control
Command: npx skills add https://github.com/apuya/react-basics-ui --skill version-control-apuya

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams working on shared repositories often end up with inconsistent branch names, lost track of feature iterations, and stale merged branches cluttering the repo. This Skill enforces a consistent branch naming convention, tracks feature version history across branches, and manages safe branch cleanup. ## Core Features & Use Cases - Convention-Based Branch Creation: Detects intent (feature, fix, chore, refactor, release, hotfix) and generates compliant names like feature/date-picker-v2, with automatic version suffix detection for iterated features. - Version History Tracking: Answers "what version is this feature?" by listing all matching branches with merge status and last-commit dates. - Safe Branch Cleanup: Lists branches fully merged into main and deletes only what the user explicitly selects, using git branch -d to prevent deleting unmerged work. - Use Case: A developer asks to rebuild the data-table component. The Skill detects existing feature/data-table and feature/data-table-v2 branches, suggests feature/data-table-v3, validates the base branch is main, and creates it with upstream tracking. ## Quick Start Ask the assistant to create a new feature branch for rebuilding the date picker component and it will suggest a versioned, convention-compliant name.

Frequently Asked Questions about version-control

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

FAQPage Schema
How do I create a git branch with a consistent naming convention?▼

Use typed prefixes followed by a lowercase kebab-case description, such as feature/date-picker or fix/badge-truncation. The Skill detects intent from your request, checks for prior versions of the feature, and confirms the suggested name before running git checkout -b.

How do I track versions of a feature across git branches?▼

Append version suffixes to feature branches: the first implementation has no suffix, major rebuilds use -v2 or -v3, and minor revisions use -v2.1. The Skill lists all matching branches with merge status and last-commit dates to show the full version timeline.

How do I safely delete merged git branches?▼

List branches merged into main with git branch --merged, then delete only the ones you explicitly select using git branch -d, which refuses to delete unmerged work. The Skill never auto-deletes and always protects main, dev, and the current branch.

What happens if I rename a git branch with an open pull request?▼

Renaming a branch with an open PR breaks the PR link, so the Skill warns you before proceeding. It renames locally with git branch -m and asks for confirmation before updating the remote with the new name.

Which branches are acceptable as a base for new git branches?▼

Acceptable bases are main, dev, and develop. Branching from any other branch triggers a warning that you may be building on a stale feature branch, though you can confirm and proceed if intentional.

Related Skills

Explore More Software Engineering Skills→
dyoshikawadyoshikawa
1

diff-analyze

Analyze git differences and commit history between the current branch and origin main.

Community
Basic
jeisenbackjeisenback

ship

Merge base branch, run tests, bump versions, update CHANGELOG, commit, and create a PR.

Community
Advanced
LZY2333LZY2333

custom-git

Generate and execute approved Git commit and branch plans.

Community
Intermediate
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced