Learning Goals: The following procedures in git should be understood

Basic Usage

Fork a repository
Clone a repository
Add a file
Commit a file
Pull from the remote repository
Push to the remote repository
Checkout a previous commit

Fix overwrite error

Check what differences there are using diff
Stash differences
Commit differences

Fix merge conflicts

Observe and understand an automerge
Observe and understand the merge conflict message
Edit a file with merge conflicts
Commit file with merge conflicts and push to repo

Using branches

Create a new branch
Switch between branches
Create a pull request from a non-master branch into the master branch
Squash changes for a single feature into one commit on master