# Scopesessions website

scopesessions.org

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

### Important development information

There are two branches:
* dev: development branch, merge to master when production-ready. 
* master: production code, always keep functional and error-free. Due to the action of .git/hooks/pre-push it is not possible to push directly into master. Code changes needs to be integrated in master only by merging dev. This way we ensure dev is always in front of master branch. Just experimenting a bit about code versioning mechanisms....

### 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
```