scopesessions.org/README.md

# Scopesessions website

scopesessions.org

* Built with Jekyll
* 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)

**NOTE:** There are two branches:
* dev: development branch, merge to master when production-ready
* master: production code, always keep functional and error-free

### Development

* Install [Jekyll](http://jekyllrb.com)
* Clone repository
```
git clone https://acorbi@bitbucket.org/acorbi/scopesessions.org.git
```
* Install dependencies
```
bower install
```
* Serve files
```
jekyll serve
```

### Deployment

* Build files
```
jekyll build
```
* Commit/Push changes to dev or other branch.
```
git add --all .
git commit -m "Changed this and that"
git push
```
* If changes in dev or other branch want to be published, first they need to be merged with on master branch
```
git checkout master
git merge dev
git commit -m "Merged master and dev"
git push
```
* SSH into scopesessions.org and pull the changes from master
```
cd /var/www/vhosts/scopesessions.org
git pull
```