Updated contents

This commit is contained in:
Open-Steps.org 2015-04-16 13:30:56 +02:00
parent 8d676a1f14
commit f483f71a82
2 changed files with 16 additions and 11 deletions

View file

@ -20,20 +20,25 @@ bower install
* Serve files
```
jekyll serve
# Serve starts a small webserver with your site on http://localhost:4000 for testing
```
* Build files
```
jekyll build
# Build generates the HTML/JS/CSS into _site/
```
* Commit/Push changes to master or other branch. **NOTE** Optimally, all changes would be done in a separated branch and then merged per Pull-Request into master.
```
git add --all .
git commit -m "Changed this and that"
git push
```
### Deployment
* Build files
```
jekyll build
```
* SSH into scopesessions.org and pull the changes from master
* SSH into scopesessions.org and pull the changes from master.
```
cd /var/www/vhosts/scopesessions.org
git checkout master
git pull
```
**NOTE:** There are two branches:
* master: production code, always keep functional and error-free
* dev: development branch, merge to master when production-ready