Git Workflow

This is a routing layer for local Git decisions, not a tutorial. It classifies your current mess (detached HEAD, diverged branch, merge conflict, accidental reset) and picks one of six workflow modes: branch hygiene, commit shaping, sync with base, conflict resolution, push safety, or undo and recovery. Every recommendation follows a safety ladder (status, reflog, force-with-lease over force, revert over reset on shared history) and hands off explicitly to code review, debugging, or task planning when the real problem isn't Git mechanics. Use it when you need the next safe move, not when you need to learn rebase from scratch.

skills.sh installs: 167
GitHub stars: 22
last updated: Jun 3, 2026

View on GitHub

Install

$ npx -y skills add akillness/oh-my-skills --skill git-workflow --agent claude-code

Installs into .claude/skills of the current project.

Files

Git Workflow

Use this skill as the repo's routing-first local Git collaboration and recovery anchor.

The job is not to teach all of Git. The job is to:

identify the current local Git state quickly,
choose one safe workflow mode,
recommend the smallest reversible fix that solves the problem,
keep boundaries to review, debugging, planning, and hosted PR workflows explicit.

Read these references when the case gets sharp-edged or the user needs more than the brief:

SKILL.md on GitHub

Sponsors

Promote your product hereReach 125k+ visitors monthly Promote your product hereReach 125k+ visitors monthly