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:14:08 +02:00
commit e964b244b3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -9,8 +9,10 @@ scopesessions.org
### Important development information ### Important development information
There are two branches: 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.... * **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