Thoughts, tutorials, and technical insights.
Conflicts mean Git found two versions of the same line and needs you to pick one. You'll fix most conflicts in under two minutes once you know the pattern.
Three ways to combine branches. Each one rewrites history differently. Pick the wrong one and you'll spend an hour untangling commits.
A branch is just a pointer to a commit. No copy of your code, no separate folder, no magic. Here's how branches really work.
I used Git for a year before I actually understood it. This article is what I wish someone had explained to me on day one.