I've been using git for nearly two decades now and yet I still seem to find new challenges and new things to learn on a regular basis. One of things that makes me scratch my head more than I would lik…

Mainlining Some very experienced developers, some of whom I've heard it from in-person, strongly advocate what is often called "mainline" or "trunk-based" development, meaning that the git history is …

Not to be confused with git rebase and the ability to squash commits locally with interactive rebase, which is a whole other flamewar. This post is predicated on giving a crap about the git history y…

You have a "feature branch" in git that you've been working on for a while but now main or master has moved on. You know of merge and rebase, but which one should you use? And what can you do to avoi…

Why you should care about writing good commit messages It is extremely likely you won't be the last person to touch this code. You will forget the details of exactly why you did something after a few…