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

Modified README.md

Browse source
This commit is contained in:
Open-Steps.org 2015-04-16 13:29:02 +02:00
parent e964b244b3
commit 8d676a1f14
1 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
README.md
View file

@ -6,14 +6,6 @@ scopesessions.org
* 1.0.0 * 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo) * [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 ### Development
* Install [Jekyll](http://jekyllrb.com) * Install [Jekyll](http://jekyllrb.com)
@ -28,29 +20,25 @@ bower install
* Serve files * Serve files
``` ```
jekyll serve jekyll serve
# Serve starts a small webserver with your site on http://localhost:4000 for testing
``` ```
### Deployment
* Build files * Build files
``` ```
jekyll build jekyll build
# Build generates the HTML/JS/CSS into _site/
``` ```
* Commit/Push changes to dev or other branch. * 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 add --all .
git commit -m "Changed this and that" git commit -m "Changed this and that"
git push git push
``` ```
* If changes in dev or other branch want to be published, first they need to be merged with on master branch
``` ### Deployment
git checkout master
git merge dev * SSH into scopesessions.org and pull the changes from master.
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 cd /var/www/vhosts/scopesessions.org
git checkout master
git pull git pull
``` ```