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

Improved Docs

Browse source
This commit is contained in:
Open-Steps.org 2015-04-16 13:12:15 +02:00
parent 5b890e4c8b
commit 0ebace23a1
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
README.md
View file

@ -6,9 +6,12 @@ scopesessions.org
* 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
### 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
@ -25,13 +28,6 @@ bower install
```
jekyll serve
```
* 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 "MESSAGE"
git push
```
### Deployment
@ -39,6 +35,19 @@ git push
```
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