Module 04 of 13

Version Control & Hosting

Lessons

About This Module

Once you're comfortable on the command line and know how machines talk to each other, the next question is how a team keeps its code — and its changes to that code — organized over time. This module covers Git: the core workflow of staging, committing, and pushing changes, and how branching and merging let multiple people work on the same codebase without stepping on each other.

It then moves into hosting and collaboration — GitHub, GitLab, and Bitbucket, opening and reviewing pull requests, the trade-offs between rebasing and merging, and the tagging and release conventions that keep a project's history readable.

Watch the lessons in order, then continue on to Containers.

Lessons

8 videos · 1 article
01

Git Fundamentals: What Version Control Solves

Why tracking changes to code matters, how Git differs from older version control systems, and the basic mental model of commits, snapshots, and history.

02

The Basic Git Workflow: Add, Commit, Push, Pull

Staging changes, writing good commit messages, and syncing your local repository with a remote one.

03

Branching & Merging Strategies

Creating branches to isolate work, common branching models like Git Flow and trunk-based development, and merging changes back together.

04

Resolving Merge Conflicts

Why conflicts happen, reading Git's conflict markers, and resolving them confidently instead of fearing them.

05

GitHub, GitLab & Bitbucket: Hosting & Collaboration

What hosted Git platforms add on top of Git itself — issues, project boards, access control, and where they fit in a team's workflow.

06

Pull Requests & Code Review

Opening a pull request, writing a description that helps reviewers, and giving and receiving feedback effectively.

07

Rebasing vs Merging

How rebase rewrites history to keep a branch clean, when to reach for it instead of a merge commit, and the risks of rebasing shared branches.

08

Tags, Releases & Git Best Practices

Tagging versions with semantic versioning, cutting releases, and habits like meaningful commits and a clean .gitignore that keep a repo healthy long-term.

09

Version Control Reference Guide

A written reference covering core Git commands, branching workflows, and pull request conventions from this module — good for a quick lookup after watching the videos.

Article