Git Workshop

Walk through an end-to-end Git workflow hands-on, with every activity spelled out using concrete commands and representative output. Copy/paste the snippets, then repeat them with your own repo/branch names to build muscle memory.

Course Content

Introduction & Prerequisites

Get your environment ready for the Git workshop. Verify your Git installation, GitHub account, and SSH authentication.

15m

Configure Git Once

Set up your Git identity, default branch, commit signing, and pager preferences. These one-time settings apply to all your repositories.

20m

Initialize & Connect a Repo

Create a new Git repository and connect it to GitHub. Learn both automated (gh CLI) and manual approaches to setting up remotes.

20m

Track Local Changes

Master the core Git workflow: staging files, reviewing diffs, committing changes, and inspecting history. Learn to use .gitignore to exclude files from tracking.

35m

Branching & Feature Delivery

Learn to create feature branches, work in isolation, and deliver changes through pull requests. Master the branch-based development workflow.

35m

Sync with Team

Learn to fetch updates from teammates, rebase your work, and cherry-pick specific commits. Keep your local repository synchronized with the team.

25m

Fork & Upstream Flow

Master the fork workflow for contributing to open source projects. Learn to clone your fork, track upstream, sync changes, and submit pull requests.

25m

Undo & Recover

Learn to recover from mistakes. Unstage files, discard changes, reset commits, revert deployed bugs, and find lost work with reflog.

30m

Parallel Work with Worktrees & Stashing

Learn to manage multiple tasks simultaneously. Use worktrees for long-running parallel work and stashing for quick context switches.

30m

History Surgery & Debugging

Master advanced history manipulation with interactive rebase and binary search debugging with bisect. Learn to tag releases and investigate changes with blame.

35m

Conflict Resolution & PRs

Master the complete conflict resolution workflow. Simulate conflicting branches, resolve merge conflicts, and manage pull requests through to completion.

35m

What you'll learn

Verify Git is installed and at the correct version
Confirm GitHub account and SSH key setup
Understand optional helper tools available
Configure your Git identity (name and email)
Set the default branch name to 'main'
Enable commit signing for verified commits