Bisect Stuck on Skipped Commits
git bisect keep skipping commits and can't identify the culprit. Use skip ranges, custom test scripts, and term aliases to finish the bisect.
#version-control
Articles tagged with #version-control
Branch Protection Blocks a Legitimate Merge
Branch protection rules are blocking a valid merge on GitHub, GitLab, or Bitbucket. Diagnose which rule is failing and resolve it without disabling protection.
Cherry-pick Becomes Empty After Resolving Conflicts
After fixing a cherry-pick conflict, Git says the commit is empty and aborts. Use --allow-empty or skip the commit when it is a true duplicate.
Credential Helper Locked, All Pulls / Pushes Fail
Git prompts for credentials on every operation or hangs indefinitely because the credential helper is misconfigured or locked. Fix it for GitHub, GitLab, and Bitbucket.
I Committed in Detached HEAD — Now What?
Made commits while in detached HEAD state and they seem lost. Attach them to a branch before Git garbage-collects them.
Force Push Overwrote Teammates' Commits
A git push --force wiped teammates' work from a shared branch. Recover the lost commits and prevent it from happening again.
Git Hooks Don't Run After Clone
Pre-commit and pre-push hooks are silent after cloning the repo. Hooks are not copied by git clone — here is the correct way to install and share them.
Large File in History Blocks the Push
GitHub rejects your push because a file over 100 MB exists in history. Remove it with git filter-repo and push cleanly.
Git LFS Pointer Not Resolved Into the Real File
Your checked-out file contains LFS pointer text instead of the real binary. Re-pull the LFS objects and fix the smudge filter in three steps.
CRLF Conversion Blew Up Into a 3,000-Line Diff
A line-ending normalization turned a 2-line change into a 3,000-line diff. Fix .gitattributes, reset the index, and stop the blowup from recurring.
Binary File Merge Conflict — Can't Resolve Manually
Git marks a binary file as conflicted but shows no diff markers. Pick the correct version and unblock your merge in minutes.
Monorepo Partial Clone Has Stale Objects
Your partial clone of a monorepo is missing blobs or shows outdated files. Re-filter the sparse checkout and update the object cache correctly.
git pull --rebase Scrambled My Conflict History
After git pull --rebase, conflicts in the replayed commits are confusing and history looks wrong. Understand what happened and recover cleanly.
Commits Disappeared After a Rebase
Your commits vanished after git rebase. Recover them from the reflog in under two minutes with no data loss.
Reverting a Merge Commit Complains About Missing -m Parent
git revert fails with 'error: commit is a merge but no -m option was given.' Understand which parent to pick and revert without losing the right changes.
I Pushed a Secret to a Public Repo
An API key or password landed in a public GitHub repo. Rotate the secret immediately, then purge it from history before anyone uses it.
Stash Gone After Checkout
Your git stash list is empty after switching branches and your work-in-progress changes have vanished. Find them in the reflog and restore them.
Submodule Won't Update to the Latest Commit
git submodule update keeps checking out an old commit even after you changed .gitmodules. Fix the pointer and sync in three steps.
Tag Points to the Wrong Commit
A release tag was created on the wrong commit. Move the tag safely, re-push it, and update any package registries that cached the old pointer.
Worktree Turns Ghost After Branch Deletion
A git worktree is locked or missing after the branch it tracked was deleted. Remove the stale worktree registration and recreate it cleanly.