Skip to main content
Academy
Beginner Code District

Git and GitHub

Save, branch, merge and collaborate on code.

Git keeps every version of your work, lets you try ideas without fear, and lets a whole team build one project together. GitHub is where those teams review and ship their code. This track starts with your very first commit and ends with the workflow professional teams follow every day: a branch for each change, a pull request, a code review, green CI checks on a protected main branch, and an automatic deploy right after the merge.

Along the way you will read history like a detective, resolve conflicts calmly, undo mistakes without losing work, and learn exactly which commands rewrite history and when that is dangerous.

Lessons
19
Time
2 h
Level
Beginner
  • Bronze open
  • Silver open
  • Gold locked

Ready to prove it?

Three exams are waiting: Bronze, Silver and Gold.

Go to the exams

What you'll be able to do

  • Save work in small, clearly described commits and read any project's history
  • Create branches, merge them and resolve conflicts calmly
  • Keep your repository in sync with GitHub using clone, fetch, pull and push
  • Ship changes through pull requests, code review and required CI checks
  • Undo almost any mistake safely with restore, revert, reset and the reflog
  • Use stash, worktrees, rebase and tags the way experienced developers do

The journey

  1. 1
    Module 1

    First steps

    What version control is, how Git differs from GitHub, and your first repository and commit.

    0 / 3
  2. 2
    Module 2

    History and clean commits

    Read the log, compare versions with diff, and decide what belongs in a commit and what Git should ignore.

    0 / 3
  3. 3
    Module 3

    Branches and merging

    Work on several ideas at once, bring them together with merge, and resolve conflicts without panic.

    0 / 4
  4. 4
    Module 4

    Teamwork on GitHub

    Remotes, fetch, pull and push, then pull requests, code review, CI checks and protected branches.

    0 / 3
  5. 5
    Module 5

    Undo without fear

    Discard, unstage, amend, revert and reset safely, rescue lost commits with the reflog, and park work with stash and worktrees.

    0 / 3
  6. 6
    Module 6

    Rebase and releases

    Replay commits with rebase, tidy them with interactive rebase, follow the golden rule, and mark releases with tags.

    0 / 3

Quick navigation