Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
Diagnose a tangled git situation and give the exact, safe commands to fix it.
Install Git Troubleshooter
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooter --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .claude/skills && cp -r skills-src/skills/git-troubleshooter .claude/skills/git-troubleshooter && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .claude/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooterType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooter --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .agents/skills && cp -r skills-src/skills/git-troubleshooter .agents/skills/git-troubleshooter && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .agents/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooter --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/skills/git-troubleshooter .cursor/skills/git-troubleshooter && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .cursor/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/mohitagw15856/pm-claude-skills.git --path skills/git-troubleshooter--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooter --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/skills/git-troubleshooter .gemini/skills/git-troubleshooter && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .gemini/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooterInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .github/skills && cp -r skills-src/skills/git-troubleshooter .github/skills/git-troubleshooter && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .github/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install mohitagw15856/pm-claude-skills git-troubleshooter --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/mohitagw15856/pm-claude-skills.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/skills/git-troubleshooter .opencode/skills/git-troubleshooter && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "git-troubleshooter" agent skill from https://github.com/mohitagw15856/pm-claude-skills/tree/main/skills/git-troubleshooter into .opencode/skills/git-troubleshooter/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "git-troubleshooter", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
git-troubleshooter- GitHub stars
- 1.4k
- Token cost
- ~654 tokens
- SKILL.md length
- 329 words
- Files
- 1
- Skills in repo
- 1,348
- Repo updated
- First seen
- Licence
- MIT
At a glance
Diagnose a tangled git situation and give the exact, safe commands to fix it.
- Asked to undo a commit
- SKILL.md covers Working from a brief, Input, Output Structure and Quality Checks, plus 2 more sections
- Calls git
- Recover lost work
What it does
Git Troubleshooter is an agent skill from mohitagw15856/pm-claude-skills. Diagnose a tangled git situation and give the exact, safe commands to fix it. Use when asked to undo a commit, recover lost work, fix a bad merge or rebase, resolve a detached HEAD, unstage files, or get out of a git mess. Produces the diagnosis, the precise commands to run in order, what each does, and a recovery note if something goes wrong.
Its SKILL.md is about 650 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: 1255 professional Agent Skills for Claude, ChatGPT, Gemini, Cursor & Codex — PRDs, postmortems, leases, medical bills, layoffs, go-bags, new countries. Plain markdown, MIT, in… The licence is MIT.
When your agent uses it
- Asked to undo a commit
- Recover lost work
- Fix a bad merge
- Resolve a detached HEAD
Example prompts
- “/git-troubleshooter”
What it can do on your machine
Read from SKILL.md and the folder at commit 1cbf1f0. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Git Troubleshooter loads about 654 tokens when it runs. Until then it costs about 91 tokens; SKILL.md has 329 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
SKILL.md
The full file from mohitagw15856/pm-claude-skills at commit 1cbf1f0, republished under its MIT licence (© mohitagw15856). 329 words, ~654 tokens.
Download SKILL.mdSave it as
.claude/skills/git-troubleshooter/SKILL.md (or your agent's skills folder).- name
- git-troubleshooter
- description
- Diagnose a tangled git situation and give the exact, safe commands to fix it. Use when asked to undo a commit, recover lost work, fix a bad merge or rebase, resolve a detached HEAD, unstage files, or get out of a git mess. Produces the diagnosis, the precise commands to run in order, what each does, and a recovery note if something goes wrong.
Git Troubleshooter Skill
Get the user un-stuck from git — calmly, safely, and without destroying work.
Working from a brief
Infer the current state from what the user describes (and typical git output); label assumptions (assumed — confirm). Always give a concrete command sequence. If a step is destructive, say so loudly before it.
Input
Ask for these if not provided:
- What happened — e.g. committed to main instead of a branch, rebase went wrong, deleted a branch with unpushed work
- What they want instead — the end state they are trying to reach
- The output —
git status,git log --oneline -5, and any error text - Whether it is pushed — whether the bad state has left their machine, which decides how safe the fix is
Output Structure
Diagnosis
One or two lines: what state the repo is in and why the user is stuck.
Fix — run these in order
A numbered list of exact commands, each with a one-line note of what it does:
1. git reflog # find the lost commit's SHA
2. git checkout -b rescue <SHA> # recover it onto a new branchPrefer non-destructive routes (branch, reflog, --soft) over destructive ones. Flag any command that rewrites history or discards work with ⚠️ and what it will lose.
Safety net
How to undo if the fix doesn't do what they expected (usually git reflog + reset to the prior HEAD), plus a one-line habit to avoid the situation next time.
Quality Checks
- The command sequence is exact and ordered (copy-pasteable)
- Destructive commands are clearly marked with what they destroy
- A non-destructive option is offered first where one exists
- A recovery/undo path is included
Anti-Patterns
- Do not suggest
git push --force,reset --hard, orclean -fdwithout a ⚠️ and a safer alternative first - Do not give commands without saying what each one does
- Do not assume the remote state — ask or label it if it changes the safe path
- Do not skip
git reflogwhen work might be recoverable — it usually is
Example Trigger Phrases
- "Undo a commit."
- "Recover lost work."
- "Fix a bad merge."
- "Resolve a detached HEAD."
- "Get out of a git mess."
© mohitagw15856, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in skills/git-troubleshooter of mohitagw15856/pm-claude-skills.
Open the folder on GitHubat commit 1cbf1f0
Compare with similar skills
Git Troubleshooter next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Git Troubleshooter this skillmohitagw15856/pm-claude-skills | 1.4k | — | ~654 | Automated safety check: Pass | MIT | |
| Finishing a Development Branchobra/superpowers | 297k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Code Design Rationale Investigatorcursor/plugins | 11k | 9 repos | ~2.6k | Automated safety check: Pass | None | |
| Contributor-First PR MergeHKUDS/OpenHarness | 16k | 1 repos | ~847 | Automated safety check: Pass | MIT | |
| Migrate Internal Package into GhostTryGhost/Ghost | 56k | — | ~3.8k | Automated safety check: Pass | MIT | |
| Create Pull Requestcline/cline | 70k | 1 repos | ~1.6k | Automated safety check: Pass | Apache-2.0 |
Similar skills
- Official
Code Design Rationale Investigator
cursor/plugins
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
Contributor-First PR Merge
HKUDS/OpenHarness
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
Migrate Internal Package into Ghost
TryGhost/Ghost
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
Create Pull Request
cline/cline
Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.
Git Merge Conflict Resolver
tailcallhq/forgecode
Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.
More from mohitagw15856/pm-claude-skills
All 1,348 skills in this repoCar Tco
mohitagw15856/pm-claude-skills
Compare the total cost of car ownership across buy-new, buy-used, lease, and keep-your-current-car — depreciation, insurance, maintenance ramp, and fuel over a real horizon, not just the monthly…
Cs Health Scorecard
mohitagw15856/pm-claude-skills
Build a customer health scorecard for a specific account. An agent skill from mohitagw15856/pm-claude-skills.
Exit Waterfall
mohitagw15856/pm-claude-skills
Compute who gets what at each exit price from a cap table — liquidation preferences, conversion points, and where the founders' share collapses.
Feature Prioritisation
mohitagw15856/pm-claude-skills
Apply prioritisation frameworks (RICE, MoSCoW, Kano, ICE, Opportunity Scoring) to rank features and backlog items.
Fire Number
mohitagw15856/pm-claude-skills
Compute a financial-independence (FIRE) target and years-to-reach with every assumption labeled as an assumption — plus a sensitivity table instead of a single false-precision answer.
Freelance Rate
mohitagw15856/pm-claude-skills
Derive a freelance day/hourly rate backwards from target income, honest billable utilization, overhead, and the self-employment tax premium — the arithmetic that proves a rate is not salary÷2000.
Related
Works with
Categories
Questions about Git Troubleshooter
What does Git Troubleshooter do?
Diagnose a tangled git situation and give the exact, safe commands to fix it. Git Troubleshooter is an agent skill from mohitagw15856/pm-claude-skills. Diagnose a tangled git situation and give the exact, safe commands to fix it.
When should I use Git Troubleshooter?
Git Troubleshooter fits situations like: asked to undo a commit; recover lost work; fix a bad merge; resolve a detached HEAD.
How do I install Git Troubleshooter in Claude Code?
Run `npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a claude-code`. Or copy the skill folder (skills/git-troubleshooter in mohitagw15856/pm-claude-skills) into .claude/skills/git-troubleshooter in your project. Claude Code loads it when a task matches its description.
How do I install Git Troubleshooter in Codex?
Run `npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a codex`. Or copy the skill folder (skills/git-troubleshooter in mohitagw15856/pm-claude-skills) into .agents/skills/git-troubleshooter in your project. Codex loads it when a task matches its description.
Can I use Git Troubleshooter in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add mohitagw15856/pm-claude-skills --skill git-troubleshooter -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-troubleshooter, .gemini/skills/git-troubleshooter, .github/skills/git-troubleshooter and .opencode/skills/git-troubleshooter in your project.
What does Git Troubleshooter need to run?
Going by SKILL.md and its folder, Git Troubleshooter needs the command-line tools its instructions call (git).
Does Git Troubleshooter access the network?
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Git Troubleshooter safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Git Troubleshooter use?
Git Troubleshooter is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Git Troubleshooter use?
About 654 tokens (SKILL.md is roughly 2.6k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Git Troubleshooter?
Skills that share tags, products or a category with Git Troubleshooter: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 11k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Git Troubleshooter?
mohitagw15856 (a GitHub user) maintains it in mohitagw15856/pm-claude-skills, which has 1,434 GitHub stars. The repository holds 1,348 skills in this directory. The repository was last updated on October 9, 2026.
Source: mohitagw15856/pm-claude-skills on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.