diff --git a/README.md b/README.md index a8774f97..7dde14ed 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,10 @@ 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 + ### Development * Install [Jekyll](http://jekyllrb.com) @@ -28,12 +32,21 @@ jekyll serve ``` 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 git pull ``` - -**NOTE:** There are two branches: -* master: production code, always keep functional and error-free -* dev: development branch, merge to master when production-ready