Modified README.md

README.md

@@ -6,14 +6,6 @@ scopesessions.org
 * 1.0.0
 * [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
 
 * Install [Jekyll](http://jekyllrb.com)
@@ -28,29 +20,25 @@ bower install
 * Serve files
 ```
 jekyll serve
+# Serve starts a small webserver with your site on http://localhost:4000 for testing
 ```
-
-### Deployment
-
 * Build files
 ```
 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 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
+
+### Deployment
+
+* SSH into scopesessions.org and pull the changes from master.
 ```
 cd /var/www/vhosts/scopesessions.org
+git checkout master
 git pull
 ```