11 articles tagged with Version Control.
Zed says agents made pull requests obsolete and shipped Delta to replace them. The review unit needs rethinking, but review itself, and the gates around it, stay.
Rejected pushes, local changes that would be overwritten, merge conflicts, detached HEAD, unrelated histories, publickey denials, and oversized files. What each message means and the safe fix.
Git dropped you into "detached HEAD" and the commits you just made seem to have vanished. Here's what happened and how to get your work back.
Deleting a committed file only hides it from the latest commit. The blob still lives in history, and if it was a secret, it's already compromised.
The rebase-vs-merge fight is mostly people talking past each other. Here's the rule we actually follow, and the one time it saved a release.
Three Git commands that all "undo" things, and picking the wrong one on a shared branch is how you ruin a teammate's afternoon. Here's how to keep them straight.
Git says it can't find a repo where you're standing. Nine times out of ten it's the wrong directory, a missing .git, or an ownership check.
Git refuses to switch branches or pull because uncommitted edits are in the way. Here's how to move them safely, and when it's fine to throw them out.
Your push bounces because the remote moved on without you. Here is how to catch up cleanly, when to rebase versus merge, and when a force-push is actually safe.
You committed too early, wrote a bad message, or included the wrong file. Here's the decision tree for undoing a Git commit safely, by what you actually want to keep.
A merge conflict isn't Git breaking. It's Git asking you a question it can't answer alone. Here's how to answer it calmly, every time.
