Learn how git tracks changes locally, manages commits, uses head, and stages files with git add before committing, while exploring branches, master, and merge and rebase.

Explain the differences between Git and GitHub, including local versus remote storage, commits, pushes, branches, and the role of pull requests.

Choose a text editor or IDE to create files and work with Git; Visual Studio Code offers an integrated terminal, with IntelliJ and Android Studio as popular alternatives.

Create a GitHub account, verify your email, and prepare to use GitHub for this course, noting Bitbucket as an optional alternative, with a desktop app covered next.

install and use GitHub Desktop or alternatives like SourceTree, compare gui and command line workflows, and configure git on your machine for commits and repositories.

Initialize a local git repository in the new basics folder, create a file named doc one dot txt, and use the terminal to navigate the project in your editor.

Initialize a new git repository, track the master branch, check status, stage files with git add, and make your first commit before linking to GitHub.

Connect your local git repository to GitHub using the GitHub Desktop app by adding an existing repository from your hard drive and publishing it to your GitHub account.

Publish your repository by naming it basics dash demo and selecting whether it stays private. Push local commits to origin on GitHub, view the repo, and see files like one.txt.

Master the commit workflow using the GUI with GitHub desktop, including creating changes, staging, committing to master, and pushing to GitHub while viewing commit history.

Learn to add a remote repo from the command line by creating a local repo, configuring origin, and pushing to master (or main).

Create a repo named challenge one and add challenge one.txt with 'Hello from challenge one'. Commit, push, then update the file to 'Hello world, I'm [your name]' and push again.

Practice the git workflow: initialize, add, commit, and push to a remote. Use CLI or GitHub Desktop to set up challenge one, track changes, update hello world text, and push.

Learn what branches are in git, how to create and switch between local branches like test from master, and merge changes back into master using practical demos.

Explore merge versus rebase in git, including how merges preserve history and resolve conflicts, and how rebase adds changes to the end and keeps commits clean.

Explore hands-on git merge and rebase workflows, switch branches, commit updates, inspect history with git log, and understand how pull requests integrate changes.

Learn to dramatically reduce commit counts with git rebase in interactive mode, squash multiple changes into a single commit, and streamline merges for cleaner history.

Resolve merge conflicts efficiently using visual tools and git commands; practice creating branches, merging master into a feature, and selecting incoming or current changes to finalize the merge.

Practice git fundamentals by creating a local repo, committing on a develop branch, updating a file to say 'challenge two', and merging to master, plus a bonus to reduce commits.

practice merging branches, switching between master and develop, committing changes, and using rebasing and squash for a cleaner history.