So, I have written a bit about Git lately. I’ve spent a fair amount studying and thinking about Git and how we use it. As part of that research I stumbled upon a really useful and humorous site called ohshitgit.
Oh Shit Git covers 9 different common scenarios and gives you a recipe for how to recover from each them. It can definitely help get you out of a bad situation. I have found myself referring to it a few times lately and was glad to have it as resource.
While Oh Shit Git is a useful resource, it helps to know a little bit about how Git works. For starters, Oh Shit Git provides you with CLI commands, so it helps to be familiar with Git Bash. A few of the resolutions have some different options. It’s good to know what all the options do. Also some of them are likely to result in conflcits, so you’ll need to be adept at resolving those. In addition several of the commands are destructive and will cause you to lose data. So it is worth approaching this with a bit of caution.
You can certainly just type in the commands presentend as-is and hope for the best, but I always recommend to have some idea of what the commands do before blindly entering them. If you want to gain a better understanding of Git so you can understand what all these commands do and have the confidence to be able to recover from any situation, be sure to check out our “Using Git Effectively” course. It’s not quite finished yet, but you can check out a free preview and pre-purchase the course at a discount if you would like.