This repository contains the activities and assignments required to complete the final course of the Front End Certificate program. All assignment submissions and quizzes/discussions will be done through either Canvas or Open EdX.
Follow these steps to get your initial setup started
- Within this html300 repo, click the
forkbutton the the top right to fork a copy to your personal GitHub account - You will be taken to your forked repo, it should say 'forked from UWFront-End-Cert/html300' under the title
- Clone the fork to your local machine
- Navigate to your fork's root folder in terminal (e.g.
cd ~/Sites/uw/html300-v2) - Add the upstream repository as a remote connection
git remote add upstream git@github.com:UWFront-End-Cert/html300-v2.git - Verify with
git remote -v, should have bothoriginandupstream - REMINDER: you will only ever push to
origin, as that's your fork. Only fetching and pulling will work withupstream.
- To keep your fork in sync with any changes to the original, we can use upstream to fetch and merge with our forks
- THIS ONLY NEEDS TO BE DONE ONCE A WEEK OR WHEN YOUR INSTRUCTOR SUGGESTS TO
- Run
git fetch upstreamto get the latest code from all branches - Verify you're on master branch with
git checkout master - Merge the upstream version of master with your fork's by running
git merge upstream/master - You shouldn't run into conflicts, but if you get errors or conflicts, you can work this guide to resolve or talk to your instructor for help https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line
- Start by checking out your local master branch and fetching/merging upstream at the beginning of each module so you know you're up to date
- From the master branch, create a branch for the lesson's assignment. Keep these branches all named consistently, like "lesson1", "lesson2", etc.
# Fetch and merge upstream master to your local master branch
$ git checkout master
$ git fetch upstream
$ git merge upstream/master
# From the master branch, create the branch for the lesson's assignment
$ git checkout -b lesson3
- Each lesson will usually have two folders,
activityandassignment. Feel free to work on the activity and assignment on the same "lessonX" branch - The
activitywill often havestarterandsolutionfolders, this is to help illustrate the starting/ending point for each - The
assignmentfolder will have the starter files and instructions required to complete - Once completed, open a new Pull Request. Within the PR, set the base to be YOUR forked master branch, and the compare branch is that lesson's assignment branch
- Copy the direct link to the pull request page, and paste that into the submission box for the assignment
- Once the assignment has been graded, merge the pull request
- Check the
README.mdfiles found in the root of eachassignmentfolder for instructions, links for tools, and any required information. Consult the rubric within Canvas for the grading scale breakdown - When you open a pull request, you may keep pushing commits to that assignment's branch as they will automatically update the PR -- no need to close and re-open a new one
- Please use the Canvas discussion boards if coming across issues or problems with assignments so all folks have visibility