Laroo-Pece Division, Gulu City, Northern Uganda
Uganda time
Web development - Intermediate

Git and GitHub: Version Control and Teamwork

Keep a safe history of your work with Git, then share and build projects with other people on GitHub using branches, pull requests, issues and GitHub Pages.

About this course

Anyone who has saved files called report_final, report_final2 and report_REAL_final already knows the problem that version control solves. Git is a free tool that remembers every version of your project, lets you go back in time, and lets several people work on the same files without overwriting one another. GitHub is a website where Git projects are stored, shared and discussed.

In this intermediate course you will install Git on Windows, record your own history with commits, work on ideas safely in branches, merge them back, and fix conflicts calmly. You will then connect to GitHub, push and pull, send pull requests, track work with issues, and publish a free web page with GitHub Pages. We finish with the habits and good manners of a respected team member.

You do not need to be a programmer, but you should be comfortable with files, folders and a text editor, and you should have met basic web pages. The examples use small projects such as a school club website and a community notice board.

What you will learn

  • Explain what version control is and why Git and GitHub are used together
  • Install and configure Git for Windows and run basic commands in a terminal
  • Create a repository and record changes with init, status, add and commit
  • Read history with log and diff and undo mistakes safely with restore and revert
  • Write a .gitignore file and a clear README for a project
  • Create, switch and merge branches, and resolve a merge conflict
  • Push, pull and clone projects between your computer and GitHub
  • Collaborate with pull requests, issues and code review, and publish a site with GitHub Pages

Course content

5 modules · 16 lessons · 4 h 27 min · 6 quizzes

Module 1: Getting started with Git3 lessons

Understand version control, install Git, and record your first commits.

  1. What version control is and why it matters 12 min
  2. Installing Git and first-time setup 15 min
  3. Your first repository: init, status, add and commit 18 min
  4. Quiz: 7 questions
Module 2: History, undoing and project files3 lessons

Read your history, undo mistakes safely, and prepare a project with .gitignore and a README.

  1. Reading history: log, diff and show 15 min
  2. Undoing mistakes safely 18 min
  3. Ignoring files and writing a README 15 min
  4. Quiz: 7 questions
Module 3: Branches, merging and conflicts3 lessons

Work on ideas in separate branches, merge them back, and resolve conflicts calmly.

  1. Branches: working on ideas safely 15 min
  2. Merging branches together 15 min
  3. Resolving merge conflicts 20 min
  4. Quiz: 7 questions
Module 4: GitHub and remotes3 lessons

Create a GitHub account, connect a remote, and move work between your computer and GitHub.

  1. GitHub accounts and pushing your first repository 18 min
  2. Clone, fetch and pull 15 min
  3. Signing in safely: HTTPS, tokens, SSH and GitHub Desktop 18 min
  4. Quiz: 7 questions
Module 5: Collaboration on GitHub4 lessons

Use forks, pull requests, issues and GitHub Pages, and learn the habits of a good teammate.

  1. Pull requests: proposing and reviewing changes 20 min
  2. Forks and contributing to other people's projects 18 min
  3. Issues, labels and project organisation 15 min
  4. Publishing with GitHub Pages and good team habits 20 min
  5. Quiz: 7 questions
Final exam

25 questions. Pass with 70% or more to earn your certificate.

What you need

  • Completed Web Basics: Build Your First Web Page (HTML and CSS), or equivalent comfort with files, folders and a text editor
  • A Windows 10 or 11 computer (Mac and Linux work too) with an internet connection
  • A free email address for your GitHub account

Further reading

To install on iPhone or iPad: tap the Share button in Safari, then choose "Add to Home Screen".