Git Stale Lock Recovery

Diagnose and recover from git stale lock files and corrupted rebase states in multi-repo workflows

vamseeachanta Updated

File contents

Git Stale Lock Recovery

When git operations fail with lock errors across multiple repos, identify stale .git/index.lock files left by crashed processes. Remove locks with rm .git/index.lock, then retry. For corrupted rebase states, check git rebase-merge/ — if only autostash exists, the rebase is corrupted; abort with git rebase --abort and use merge instead. Always wait for background git processes (check ps) before retrying, as incomplete operations leave stale locks.

vamseeachanta/workspace-hub/tree/main/.agents/skills/workspace-hub/learned/git-stale-lock-recovery commit 70f4897b8a

Frequently asked questions

npx skillmds@latest add vamseeachanta/git-stale-lock-recovery