- What is Git?
- What are ‘branches’?
- Getting Started
I’ll cover how to go about this exactly, but as an overview, you need these:
- Server that hosts your Git projects.
- Project to host your files.
- A client to grab projects from the server, and manage them on your machine.
If this sounds like hocus-pocus, don’t worry, it’s easier than it sounds. The server part is simple because there are websites out there that do this for us. Head to https://gitlab.com and make an account. There, done.
Now you have a Git server that you can use.
From your GitLab account, find the New Project button. It’s in a few places, but you’ll always find it at the top-right of the GitLab webpage.
This again is terminology that catches people off-guard. All this really means for you is “Software”. You need to download a program that can communicate with your server from your machine (otherwise known as a client). At this point, I have 3 unique
suggestions (Ignore the 4th… it’s just an honorable mention):
IT’S A GOOD IDEA TO FOLLOW MY GUIDE, ‘Getting Started with Git CLI for windows (Git Bash)‘ BEFORE INSTALLING GITKRAKEN OR TORTOISEGIT!!!
My honest advice is to download all 3 (excluding Sourcetree). They each do the same thing, yet they’re each better than the other at certain tasks. No matter which client you use, you’ll have the same setup procedure for each, though it’s carried out slightly differently
in each program. That process is as follows:
- Install software
- Setup SSH Key
- Open / Clone project
- Checkout / Commit / Push / Pull
You would have to learn the same procedure differently depending on which client you decide to go with. To help make that decision, here are some small descriptions that also let you see how pretty the user interface is for each:
It’s text-based, it’s ugly, it’s for power-users, you don’t wanna know about it, I get that. However, I recommend installing this regardless of whether or not you decide to go with an alternative option. The alternative options may require this to
be installed, so install it.IT’S A GOOD IDEA TO FOLLOW MY GUIDE, ‘Getting Started with Git CLI for windows (Git Bash)‘ BEFORE INSTALLING GITKRAKEN OR TORTOISEGIT!!!
Manage your Git project from the comfort and familiarity of the classic right-click context
menu. It has a nice method for resolving conflicts if two people happen to commit work on the same file. I recommend having it purely for that purpose.
It’s beautiful and easy to learn. Possibly the easiest to learn. It has a really simple generator
to help you get going with an SSH key when you get to that point. I give this client a gold-star. I’m using it predominantly myself.
It’s like GitKraken but not as pretty. It’s a bit outdated nowadays, despite still receiving
updates. I don’t see the point to be honest, GitKraken does the same thing but makes it a lot easier.
Once you’ve chosen a client, you will want one of these guides: I recommend following the CLI guide right the way through, even if you don’t plan to use it. it will make some of the tricky SSH parts a bit simpler if you decide to use one of the other
GIT clients instead, otherwise, be prepared for a little pain.