From 5dc353a8990a632166cad377b8c5c8106d85f3f1 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 17 Sep 2020 14:21:25 +0300 Subject: [PATCH] Updated Hosting on GitHub pages (markdown) --- Hosting-on-GitHub-pages.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Hosting-on-GitHub-pages.md b/Hosting-on-GitHub-pages.md index caf7dab..7865452 100644 --- a/Hosting-on-GitHub-pages.md +++ b/Hosting-on-GitHub-pages.md @@ -1,5 +1,6 @@ If you don't have a webserver to run the files on, you can also use something like GitHub pages. +## Setup 1. Fork the repo ![arrow pointing at fork button](https://mau.photos/oQRHL.png) 2. Go to settings @@ -10,8 +11,11 @@ If you don't have a webserver to run the files on, you can also use something li 5. Click "Save" ![arrow pointing at save button](https://mau.photos/C16js.png) 6. Clone your fork (`git clone git@github.com:username/stickerpicker.git`) -7. Follow the instructions in [Creating packs](https://github.com/maunium/stickerpicker/wiki/Creating-packs) to create packs +7. Follow the instructions in [Creating packs](https://github.com/maunium/stickerpicker/wiki/Creating-packs) to create packs. In step 1 of the preparation, clone your own fork instead of maunium/stickerpicker. 8. Commit your changes (`git add web/packs && git commit`) and push (`git push`) 9. Follow the instructions in [Enabling the widget](https://github.com/maunium/stickerpicker/wiki/Enabling-the-widget) using `https://username.github.io/stickerpicker/web/?theme=$theme` as the `url` field. -To add more packs, simply do steps 7 and 8 again. \ No newline at end of file +## Updating +To add more packs, simply do steps 7 and 8 again. + +To update your copy of the sticker picker to the latest version, first add the upstream repo as a remote: `git remote add upstream https://github.com/maunium/stickerpicker.git` (this only needs to be done once). Then whenever you want to update, run `git fetch upstream`, `git merge upstream/master` and `git push` \ No newline at end of file