skills.rest
smallorbit
smallorbitCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

hotfix

Create a hotfix branch from main, apply the fix, and open a PR.

Updated Apr 17, 2026
Search Tags:#git#branch#pr#hotfix#develop#tag#emergency
One-click install
npx skills add https://github.com/smallorbit/smallorbit-plugins --skill hotfix-smallorbit
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: hotfix
Source: https://github.com/smallorbit/smallorbit-plugins/tree/main/plugins/flowkit/skills/hotfix
Command: npx skills add https://github.com/smallorbit/smallorbit-plugins --skill hotfix-smallorbit

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Emergency fixes must be applied quickly to the main branch and then synchronized with develop. This Skill streamlines the process of branching, tagging, and back-merging to minimize drift and risk.

Core Features & Use Cases

  • Create a hotfix branch off main and apply an emergency fix.
  • Tag the fix on main and back-merge into develop to keep branches aligned.
  • Open a PR targeting main and manage base scope with pr-base-scope for clean release history.

Quick Start

Describe the fix in ARGUMENTS and initiate the hotfix workflow to create a branch from main, apply the fix, and open a PR back to main.

Frequently Asked Questions about hotfix

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

FAQPage Schema
How do I create a git hotfix branch for an emergency fix on main?▼

To create a git hotfix branch, derive a kebab-case slug from your fix description, branch off main, apply the changes, and push a tagged release back to the main branch.

What is the best way to back-merge a hotfix into the develop branch?▼

Back-merging a hotfix into develop synchronizes the branches after an emergency fix; you apply the fix to main, tag the release, and merge those changes back to keep develop aligned.

How do I tag an emergency release in git after applying a hotfix?▼

Tagging an emergency release in git compiles an annotated tag on the main branch immediately after the hotfix is applied, ensuring the production codebase marks the specific fix version.

Can I open a PR for a hotfix without manually setting the base scope?▼

Opening a PR for a hotfix coordinates with a pr-base-scope workflow to automatically manage the base scope, ensuring a clean release history when targeting the main branch.

Does the hotfix workflow require confirmation before committing the emergency fix?▼

Yes, the hotfix workflow requires explicit user confirmation before committing the emergency fix to the main branch, preventing accidental deployments of unverified changes.

When should I use a dedicated hotfix branch instead of committing directly to develop?▼

Use a dedicated hotfix branch when shipping urgent fixes to main, because committing directly to develop skips the required tagged release and delays the fix for production.

Related Skills

Explore More Software Engineering Skills→
alexanderopalexanderop

using-git-worktrees

Create isolated git worktrees for feature branches with safety checks.

Community
Advanced
AndrewDrygaAndrewDryga
28

release

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

Community
Advanced
tneztnez
2

pr

Creates a pull request from the current branch to main using GitHub CLI.

Community
Intermediate
Knuckles-TeamKnuckles-Team
2

git-advanced

Automate Git history fixes using rebase, cherry-pick, and bisect workflows.

Official
Advanced