Git & GitHub Masterclass: The Practical Bootcamp

Explore how git enables distributed version control with online repositories, complete history, and versioned changes to safely manage code and collaborate across teams using GitHub or similar platforms.

Install and verify git on your system, set up a GitHub account, and configure a development environment with VS Code and a project folder for hands-on version control.

Configure global git user email and user name to track who changes what in a project, then verify with git config --list and use git bash or the terminal.

Explore how Git saves history and tracks changes through the working directory, staging area, and local repository life cycle, then push to a remote repository like GitHub.

Push your local changes to GitHub by linking your project to a remote repository, configure origin, switch to the main branch, and push with authentication using a personal access token.

Practice essential git commands to manage changes from working directory to staging area and history, including status, add, commit, log, and push, while understanding head and origin concepts.

Explore the git lifecycle from the working directory to staging, local, and remote repositories, and learn how add, commit, and push move changes through modified, unmodified, and untracked states.

Learn how the commit timeline works in git, where each commit stores only changes as a snapshot with a hash, a parent pointer, and head position.

Learn how to use git diff to compare the current working directory with the last commit, review changes across commits, and track additions and removals like modified html tags.

Learn how to use git stash to save and manage temporary changes, apply and pop stashed work, name stashes, and switch between multiple changes without losing progress.

Master git restore to revert changes and reset files to the last commit from your working directory or staging area, and track progress with git status and git log.

Learn how git branches organize work beyond the main branch, with feature and bug‑fix branches, and how to commit, merge, and pull changes.

Learn how to create and manage feature branches, switch between branches, commit changes, merge into main, and push and delete branches in a practical git workflow.

Create and switch to a feature branch named search, commit and push changes, then pull main into search and merge back into main.

Learn to use git pull to fetch and merge remote main changes before pushing your own work, ensuring you align local and remote repositories when collaborating.

Explore practical git workflows, including initializing a repository, renaming master to main, staging and committing, and creating branches; learn how merge conflicts arise and how to resolve them.

Resolve merge conflicts in index.html, switch branches, and complete merges using VS Code; choose between current and incoming changes, and manage merged and unmerged branches.

Delete merged and unmerged branches in Git by using -d for merged branches and -D to force deletion. Understand that unmerged changes are lost when deleting a branch.

Push changes to GitHub by linking a local project to a remote repository and pushing main. Set upstream for future pulls and connect to the Foodmart repository.

Learn how to use git pull to fetch remote changes from origin main into your local working directory, keeping your project up to date in team workflows.

Explore git rebase, how it moves feature commits on top of main, compare it with merge, and learn practical steps and conflicts to expect in real workflows.

practice rebasing a feature branch onto main, resolve a merge conflict on index.html, then continue the rebase, push changes, and delete the feature branch.

Compare merge and rebase to see how merge preserves history on main and feature branches with conflict records, while rebase can erase that history and alter commit order.

Learn to use the dot gitignore file to ignore env files, passwords, and junk files, ensuring untracked items stay out of version control, with project templates for React or Django.

Learn how to create and structure a README.md, including essential sections, installation docs, demos, screenshots, markdown formatting, images, links, and git commands.

Learn to squash multiple git commits into one using an interactive rebase, leveraging head references and the pick and squash commands to clean up index-related changes.

Discover how to revert specific commits in git with git revert, choosing commit IDs or head positions, using the interactive shell, and then push changes to main.

Explore how git reset operates in three modes: soft, mixed, and hard, and move changes between the working directory, staging area, and commits with practical examples.

Explore how to use Git tag to mark version points in history. Push tags to remote, create GitHub releases, and add release notes with annotated tags for version management.

Learn how to use git checkout to move between commits and tags, attach tags to releases, view history with git log, and delete or push tags to remote as needed.