Git Crash Course: A Simple Workflow for Small Teams and Startups

Prerequisites

This course is for anyone who is familiar with the command line and needs to know all the essential commands for the Git utility. You will need to have the following knowledge:

• Basic understanding of coding languages (we will not write any code, but will be looking at some)
• Basic mastery of the command line
• Basic understanding of open source software

Table of Contents

Beginner

• Why Use Git?
• Installation and Adding Credentials to Git
• Barebones Basics
• Github vs. Gitlab vs. Bitbucket vs. Local

Intermediate

• A Simple, Effective Git Workflow
• Setting up the Repo
• Tagging the first Production Release
• Creating and working with branches
• Merging Branches

Advanced

• Common Git Problems and Advanced Git
• Merge Conflicts between Local and Remote Repos
• Merge Conflicts in the local repo
• Fixing Merge Conflicts with VSCode
• Reverting, Resetting, and Checking Out
• Upstream and Downstream Conflicts
• Conclusion

Why Use Git?

Git is a widely accepted, open-source, local source control tool that enables single developers or teams to manage their source code in a decentralized way. I devoted an entire section to this question, but truthfully, you won’t see the true power of this tool until we start using it.

Installation and Adding Credentials to Git

To install, run the following command on:

Windows (using Chocolatey Package Manager)

choco install git -params '"/GitAndUnixToolsOnPath"'