Improving docs

This commit is contained in:
Open-Steps.org 2015-04-16 13:06:10 +02:00
parent a348155fef
commit 7546f4a904

View file

@ -6,9 +6,11 @@ scopesessions.org
* 1.0.0
* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
**NOTE:** There are two branches:
### 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
* 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