git-large-file-staging-conflict-recovery
Recover from pre-commit hook blocks on oversized files and corrupted rebase states during bulk repo syncs
Best use case
git-large-file-staging-conflict-recovery is best used when you need a repeatable AI agent workflow instead of a one-off prompt.
Recover from pre-commit hook blocks on oversized files and corrupted rebase states during bulk repo syncs
Teams using git-large-file-staging-conflict-recovery should expect a more consistent output, faster repeated execution, less prompt rewriting.
When to use this skill
- You want a reusable workflow that can be run more than once with consistent structure.
When not to use this skill
- You only need a quick one-off answer and do not need a reusable workflow.
- You cannot install or maintain the underlying files, dependencies, or repository context.
Installation
Claude Code / Cursor / Codex
Manual Installation
- Download SKILL.md from GitHub
- Place it in
.claude/skills/git-large-file-staging-conflict-recovery/SKILL.mdinside your project - Restart your AI agent — it will auto-discover the skill
How git-large-file-staging-conflict-recovery Compares
| Feature / Agent | git-large-file-staging-conflict-recovery | Standard Approach |
|---|---|---|
| Platform Support | Not specified | Limited / Varies |
| Context Awareness | High | Baseline |
| Installation Complexity | Unknown | N/A |
Frequently Asked Questions
What does this skill do?
Recover from pre-commit hook blocks on oversized files and corrupted rebase states during bulk repo syncs
Where can I find the source code?
You can find the source code on GitHub using the link provided at the top of the page.
SKILL.md Source
# 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.
Related Skills
work-around-merge-conflicts-in-test-execution
Run tests when repo has unresolved merge conflicts in config files by bypassing broken configs and executing tests directly
multi-repo-stale-lock-recovery
Diagnose and recover from stale git lock files in multi-repo workspaces, especially with submodules
multi-repo-pull-with-untracked-conflict-recovery
Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
multi-repo-git-recovery
Diagnose and recover from stale lock files, diverged branches, and untracked file conflicts across multiple repos in a workspace ecosystem
multi-file-tax-reconciliation-workflow
Systematic parallel review and reconciliation of multi-document tax filings with cross-reference validation
multi-file-tax-prep-orchestration
Structured approach to complex multi-file tax return preparation with traceability and planning
git-stale-lock-recovery
Diagnose and recover from git stale lock files and corrupted rebase states in multi-repo workflows
freetaxusa-form-entry-recovery
Handle session timeouts and modal dialogs when entering tax forms in FreeTaxUSA
freetaxusa-eefile-navigation-pattern
Handling session timeouts and navigating FreeTaxUSA's multi-step e-filing flow to the signature page
diagnose-venv-shebang-conflicts
Debugging pattern for resolving ModuleNotFoundError when CLI entry points use wrong Python interpreter
interactive-Codex-to-file-based-fallback
Switch from tmux/interactive Codex to file-based Codex -p execution when interactive runs fail with upstream errors or analysis-only stalls, then verify landing from git/GitHub state.
repo-sync-deleted-remote-branch-and-unrelated-history-recovery
Recover multi-repo sync failures caused by deleted upstream branches, stale git index locks, and local branches with unrelated history to the remote default branch.