From 7546f4a904a0069d8ab9d573abc1467137e12964 Mon Sep 17 00:00:00 2001 From: "Open-Steps.org" Date: Thu, 16 Apr 2015 13:06:10 +0200 Subject: [PATCH] Improving docs --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7dde14ed..af23a028 100644 --- a/README.md +++ b/README.md @@ -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