Merge master branch into gh-pages and close master #406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Difference between "We will be styling this page" at https://github.com/codebar/tutorials/blob/master/html/lesson2/tutorial.md#today-we-will-be-focusing-on-fundamental-css-concepts and "Download the files required to begin working through the tutorial from here(mac/linux) or here(windows)" at https://gist.github.com/hundred/7332441/download
missing class from the tutorial example
|
If you only have one branch anyway, you can configure it to deploy from master. |
|
@taw I agree and that's what I would have done when setting up this repo, but it's done now, and there are 15 active PRs into |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The master branch is 3 commits ahead (and 345 commits behind) gh-pages, because #389 was, I presume, accidentally(?) merged into master instead of gh-pages. Once this PR/branch is merged into gh-pages, we can delete this branch, which will hopefully prevent similar confusion in the future.