randogoth/scopesessions.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source 
Conflicts:
	README.md
This commit is contained in:
Open-Steps.org 2015-04-16 13:02:15 +02:00
commit a348155fef
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
README.md
View file

@ -6,6 +6,10 @@ scopesessions.org
* 1.0.0 * 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) * [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 ### Development
* Install [Jekyll](http://jekyllrb.com) * Install [Jekyll](http://jekyllrb.com)
@ -28,12 +32,21 @@ jekyll serve
``` ```
jekyll build 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 * SSH into scopesessions.org and pull the changes from master
``` ```
cd /var/www/vhosts/scopesessions.org cd /var/www/vhosts/scopesessions.org
git pull 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