# Recover From Corrupted Git State

> Diagnose and recover from corrupted git states (stale locks, failed rebases, pre-commit hook blocks) during bulk operations

- Skill: `vamseeachanta/recover-from-corrupted-git-state` (Agent Skill)
- Install (CLI): `npx skillmds@latest add vamseeachanta/recover-from-corrupted-git-state`
- Raw SKILL.md: https://api.skillmd.com/api/skills/vamseeachanta/recover-from-corrupted-git-state/raw
- Safety review: PASS (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: vamseeachanta (https://skillmd.com/u/vamseeachanta)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/vamseeachanta/recover-from-corrupted-git-state

---


# Recover from Corrupted Git State

When bulk git operations (large commits, background pulls, rebases) fail or leave stale state: (1) Check for lock files and background processes (`ps aux | grep git`); (2) Detect corrupted rebase state via `rebase-merge` directory — abort with `git rebase --abort` and switch to merge; (3) If pre-commit hooks block large files, unstage oversized files and recommit selectively; (4) For untracked file conflicts during pull, move conflicting files to `/tmp`, pull, then restore; (5) Always verify final state with `git status` and divergence count (should be 0/0 after sync).