What causes an 'already used by worktree' error?

This usually occurs when a Git worktree directory is manually deleted without using the 'git worktree remove' command, leaving stale metadata in the .git folder that claims the branch is still checked out.

What is the 'Nuclear Option' for Git recovery?

The nuclear option involves forcefully deleting local branch references and recreating them from the remote origin to ensure all local corruption is bypassed and state is synchronized with the server.

How do I fix a corrupted Git HEAD reference?

This skill provides specific commands to force reset the HEAD by pointing it back to a valid branch reference, either through git commands or by safely modifying the .git/HEAD file.

Can this skill help if git worktree prune fails?

Yes, it includes manual cleanup procedures to remove specific files within the .git/worktrees directory that may be preventing standard pruning commands from working.

Git State Recovery Specialist

Name: Git State Recovery Specialist
Author: delorenj

bydelorenj

•

开发者工具

Diagnoses and repairs corrupted Git states, orphaned worktrees, and inconsistent branch references.

This skill provides a comprehensive toolkit for troubleshooting complex Git issues that standard commands often fail to resolve. It guides users through identifying corruption types—such as phantom worktrees, detached HEAD states, and branch lock conflicts—and offers step-by-step recovery procedures ranging from simple pruning to manual metadata cleanup. It is particularly valuable for developers working with multiple worktrees or complex branch management who need to restore repository integrity and unblock their workflow without resorting to a fresh clone.

主要功能

01Automated diagnostic sequences for Git HEAD and worktree integrity

02Procedures for manual cleanup of corrupted .git internal states

03Step-by-step recovery for orphaned worktree metadata and phantom claims

04Integration patterns for building robust Git state validation into custom scripts

05Techniques for resolving branch lock conflicts and inconsistent symbolic references

065 GitHub stars

使用场景

01Pruning stale worktree references that prevent normal branch deletion or switching

02Recovering from a corrupted HEAD that points to a non-existent branch reference

03Fixing 'already used by worktree' errors when the directory no longer exists

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add delorenj/skills recovering-from-bad-git-state

For use in Claude.ai and ChatGPT

Download Skill