Oh Shit, git!

A 'zine to help you get out of git messes

If git confuses you, don't worry! You're joining plenty of others who feel the same. Even seasoned git users make mistakes and struggle with fixing them daily. Many git commands have confusing names — why do we use git checkout to create new branches? —and there are countless ways to achieve the same task.

Enter Oh Shit, git! — a publication from Wizard Zines — the work of Katie Sylor-Miller (self-described Fairy GitMother and frontend architect at Etsy) and Julia Evans (Montreal-based software developer). The zine offers humorous and practical advice on correcting common git errors and offers solutions for confusing mistakes, such as committing to the wrong branch.

Oh Shit, git! covers the “fundamentals” of git — what is a SHA, the nature of commits and branches, and a list of common unfixable mistakes. The ‘zine also offers practical solutions for common errors like changing commit messages, handling accidental commits to the wrong branch, resolving merge conflicts, and managing rebases with extensive conflicts. It even addresses how to undo changes made several commits ago.

There are several purchasing options available, including a personal license for only $ 12 USD.