# Git Large File Staging Conflict Recovery

> Recover from pre-commit hook blocks on oversized files and corrupted rebase states during bulk repo syncs

- Skill: `vamseeachanta/git-large-file-staging-conflict-recovery` (Agent Skill)
- Install (CLI): `npx skillmds@latest add vamseeachanta/git-large-file-staging-conflict-recovery`
- Raw SKILL.md: https://api.skillmd.com/api/skills/vamseeachanta/git-large-file-staging-conflict-recovery/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/git-large-file-staging-conflict-recovery

---


# Git Large File Staging & Rebase Corruption Recovery

When pre-commit hooks block commits due to oversized files (e.g., >5MB logs), unstage the problematic files, reset the staging area, then selectively re-add excluding large aggregated files. If a rebase-merge directory exists with only an autostash file, it signals corruption — remove it and switch to merge-pull instead. For untracked files blocking pulls, move them to /tmp, complete the pull, then restore. Use `git status` and `git log` to verify state before proceeding.