Category: Git

How to name branches so your team understands at a glance what they contain, which ticket they map to, and when it's safe to delete them.

Atomic commits, messages that explain the why, and the Conventional Commits standard: the difference between a history that documents and one that just takes up space.

Conflict markers make sense once you understand the three-way merge: what HEAD means, what the separator does, and how to resolve conflicts cleanly with or without visual tools.

Who broke everything? git blame tells you line by line, and when history gets messy, git log has options you probably did not know to trace code even after it changed names.

Learn to use git bisect to find the exact commit that introduced a bug using binary search — and how to automate it so Git does all the work while you grab a coffee.

Learn to use git reflog to recover deleted commits, lost branches, and any change that seemed gone forever after a reset or a Git mistake.

Learn how to use git cherry-pick to apply specific commits from one branch to another—perfect for backporting hotfixes, rescuing buried work, and surgical history management.

Learn how to use git rebase -i to reorder, combine, rename, and delete commits before integrating your work. Take full control of your history, commit by commit.

Learn what rebase is in Git, when to use it instead of merge, how to resolve conflicts during the process, and the golden rule you must never break.

Learn to send and receive changes in Git with git push and git fetch. Understand the difference between fetch and pull, how to use --force-with-lease, and why git push --force is a bad idea.