Closed LearningNerd closed 6 years ago
Quick update @edselhans -- I somehow completely forgot that there's no easy way to directly merge single commits form one branch to another; it's only merging the ENTIRE branch with all its changes.
Soooo I made a couple new branches with naming convention like draft-1-2
, for the section that's being worked on.
That way merging should be easier (less conflicts). Following the "feature branch" workflow which is maybe the most common GitHub workflow I've seen other dev teams using. Info/tutorial on it: https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
Be sure to pull from the
draft
branch to see the outline I added here: https://github.com/LearnTeachCode/intro-javascript-class/blob/draft/week-1/1-2-review-hangman-game.mdThings to add:
[x] Fix section links in the table of contents at the top (the format is #121-heading-goes-here with spaces turned into hyphens, all other special characters removed, and all lower case). You can see the materials for thee section 1.1 page as an example.
[ ] A one-sentence description below each section title. (Some are already completed, so feel free to borrow from those.)
[ ] If there's extra time and if it seems relevant, add some short practice challenges to go with each section to help students test their knowledge.
(Example: "Add another HTML element to the page with a unique
id
attribute, and then write a line of JavaScript that translates that element into a JavaScript object and saves it to a new variable.")Hmm.. or if you think practice challenges aren't a good fit here, or for any particular section, maybe just list a few key points or topics covered in each section? (Example: - How to create a new variable, - How to change the value of an existing variable, - ...)
Please share edits via pull request, and you can format the PR title like "Resolves issue #4: ..." so that way, when it's merged in, GitHub automatically closes that issue! (Fancy huh?)
For an example of this workflow, see:
And please create new issues on this repo for any other suggestions / things to fix!