skills.rest
Pixley-Growth
Pixley-GrowthOFFICIAL
Explore all skills by this author →
GitHub

hotfix-done

Merge hotfix to main and feature branches, tag release, and clean up.

3|Updated Jan 16, 2026
Search Tags:#git#release management#branch management#merge#hotfix
One-click install
npx skills add https://github.com/Pixley-Growth/cal-plugin --skill hotfix-done
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: hotfix-done
Source: https://github.com/Pixley-Growth/cal-plugin/tree/main/skills/hotfix-done
Command: npx skills add https://github.com/Pixley-Growth/cal-plugin --skill hotfix-done

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

Manages the structured exit from hotfix mode by orchestrating merges, tagging, and cleaning up the worktree.

Core Features & Use Cases

  • Merge Management: Handles the merge from hotfix to main and then to feature branches, ensuring all changes are integrated.
  • Tagging Release: Automates the process of tagging the release on the main branch.
  • Worktree Cleanup: Removes the hotfix worktree and deletes the hotfix branch after successful merges.
  • Branch Switch Back: Returns to the parked branch after completing the hotfix.
  • Update CLAUDE.md: Updates the document to reflect the transition from hotfix mode to normal mode.
  • Output Summary: Provides a summary of the completed hotfix process.

Quick Start

To exit hotfix mode and integrate changes, use the command: /cal:hotfix-done

Frequently Asked Questions about hotfix-done

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

FAQPage Schema
How do I exit hotfix mode and merge changes back to the main branch?▼

To exit hotfix mode, merge the hotfix branch into main, then propagate changes to feature branches. Tag the release on main, remove the hotfix worktree, delete the hotfix branch, and switch back to your parked branch.

What is the process for merging a hotfix into active feature branches?▼

Merging a hotfix into feature branches involves integrating the completed hotfix changes from main into each active feature branch. This ensures all parallel development work includes the critical fix before continuing.

How do I tag a release after completing a git hotfix?▼

Tag a release after a hotfix by applying the git tag to the main branch immediately following the merge. This marks the updated main branch state as the new stable release version.

Does exiting hotfix mode require manual worktree cleanup?▼

Exiting hotfix mode does not require manual worktree cleanup. The process automatically removes the hotfix worktree and deletes the hotfix branch after verifying successful merges and tagging.

Can I automate branch switching back to my original branch after a hotfix?▼

You can automate branch switching after a hotfix. The process returns you to your previously parked branch automatically once the merges, tagging, and cleanup are fully completed.

Why update CLAUDE.md when finishing a hotfix?▼

Updating CLAE.md when finishing a hotfix records the transition from hotfix mode back to normal development mode. This document update maintains accurate workflow context for the repository.

Related Skills

Explore More Software Engineering Skills→
Pixley-GrowthPixley-Growth
3

hotfix

Create hotfix branches and park feature work using git worktrees.

Official
Intermediate
AndrewDrygaAndrewDryga
28

release

Create semantic version tags from changelogs and push them to Git.

Community
Advanced
ReinaMacCredyReinaMacCredy

pull

Merge origin/main into a local Git branch with guided conflict resolution.

Community
Intermediate
DecentralizedGeoDecentralizedGeo
1

finishing-a-development-branch

Verify tests and guide Git merge decisions with worktree cleanup.

Official
Advanced