search

codebar / tutorials

🗒 codebar's tutorials
http://tutorials.codebar.io/
257 stars 241 forks source link

Merge master branch into gh-pages and close master #406

Open richardwestenra opened 5 years ago

richardwestenra commented 5 years ago

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.

image

taw commented 5 years ago

If you only have one branch anyway, you can configure it to deploy from master.

richardwestenra commented 5 years ago

@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 gh-pages, and it doesn't really matter anyway, so for now I think the best approach is to delete master. If we ever clear out all the active PRs then we can look into switching the default branch back to master.