Some git commands outside of the most basic of basics usage of git. Thumbnail courtesy Discord member A Soulful Horse Portrait.

Git and other version control systems are pretty useful, especially if you’re working on multiple computers and perhaps with other collaborators. They let you keep track of who has accomplished what and at what time, as well as keeping a history of all your changes, so that you can always go back into your development history and take a peek or revert some changes. As nice-sounding and magical as it sounds, git can be a scary landscape to navigate. Some of the most basic commands we need to be able to use git are:

Assuming we’re only working on a single master branch (let’s not get into the topic of branches now…), this basic commandset usually works alright. The trouble arises when there’s a merge conflict. This happens when you try to git pull from the branch, and there are some changes that happened earlier that are incompatible with your current changes. You have a couple options to resolve this merge conflict issue:

We only just recently learned about these commands, but they are saving many hairs from being pulled out in frustration. With these new commands, we can now start to figure out how to navigate the whole branches landscape, but that’s a topic for another day, complete with pictures and referrals to other people’s blogposts.