Streamline small bugfix workflows with git worktrees and PR best practices.
Install
mkdir -p .claude/skills/bugfix && curl -L -o skill.zip "https://agentskills.codes/api/skills/download/16208" && unzip -o skill.zip -d .claude/skills/bugfix && rm skill.zipInstalls to .claude/skills/bugfix
Activation
This is the description your AI agent reads to decide when to run this skill — the better it matches your request, the more reliably it fires.
Create and manage non-urgent bugfix branches in a git worktree with standard PR workflow (squash merge).Key capabilities
- →Create a git worktree for a bugfix branch
- →Generate a deterministic bugfix branch name
- →Guide synchronization with the main branch
- →Provide instructions for pull request creation
- →Guide safe cleanup of the worktree
How it works
The skill converts a task title into a `bugfix/<slug>` branch name and creates a git worktree at a specified path. It then provides guidance for syncing with `origin/main` and creating a pull request.
Inputs & outputs
When to use bugfix
- →Create bugfix branch
- →Manage git worktrees
- →Prepare squash merge PR
- →Sync with main branch
About this skill
What I do
- Turn a short task title into a deterministic
bugfix/<slug>branch name. - Create a git worktree at
../.worktrees/pluto/<branch_sanitized>. - Guide sync with
origin/main. - Guide PR creation (GitHub, squash merge; do not merge automatically).
- Guide safe cleanup (remove worktree only).
Naming
- Base branch:
origin/main - Branch:
bugfix/<slug> - Slug rules: same as
feature(max 60). - Worktree path: same as
feature.
Workflows
Use the same steps as feature.
- Sync: prefer
git rebase origin/main - PR: recommend Conventional Commit PR title (often
fix(...)). - Cleanup: remove worktree only.
When not to use it
- →When the bugfix is urgent and requires immediate attention outside a standard PR workflow
- →When the task title is too long for the slug rules
Limitations
- →Branch names are limited by slug rules (max 60 characters)
- →PR creation guidance is specific to GitHub squash merge
- →Cleanup only involves removing the worktree
How it compares
This skill automates branch naming and worktree creation, providing structured guidance for a standard PR workflow, unlike manual git operations.
Compared to similar skills
bugfix side by side with the closest alternatives in the catalog.
| Skill | Installs | Updated | Safety | Difficulty |
|---|---|---|---|---|
| bugfix (this skill) | 0 | 5mo | No flags | Beginner |
| resolve-conflicts | 81 | 8mo | Review | Intermediate |
| dependency-upgrade | 26 | 5mo | Review | Intermediate |
| git-commits | 21 | 4mo | No flags | Beginner |
Try saying
Example prompts that trigger this skill in your AI assistant.
More by diegosouzapw
View all by diegosouzapw →You might also like
resolve-conflicts
antinomyhq
Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.
dependency-upgrade
wshobson
Manage major dependency version upgrades with compatibility analysis, staged rollout, and comprehensive testing. Use when upgrading framework versions, updating major dependencies, or managing breaking changes in libraries.
git-commits
bonny
Create well-structured git commits in logical chunks following best practices
git-advanced-workflows
wshobson
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
github-multi-repo
ruvnet
Multi-repository coordination, synchronization, and architecture management with AI swarm orchestration
git-workflow-enforcer
CrazyDubya
Ensures commits follow conventional commits, branch naming conventions, and PR templates. Use when creating commits, branches, or PRs, or when user mentions git workflow.