From 3a62687d6eb6f911cdd370dd9bd7df3bae5545e7 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Sun, 20 Jul 2014 17:05:15 +0200
Subject: deploying details added to readme

---
 README.md | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 24274c0..bebc405 100644
--- a/README.md
+++ b/README.md
@@ -41,12 +41,24 @@ Detailed description:
 
 **Never** edit the files directly on the server!
 The dev server uses the *dev* branch, the live server uses *master*.
-
-Please use the script `<server-dir>/git_pull_utils.sh`.
-**Do not use `git pull` on the server!**
-All files must be owned and pulled by the *redstoner* user.
-
-Be **very careful** with the live server! Make sure you're in the *master* branch and the code is working before pulling/restarting!
+**Do not use `git pull` on the server!** *(All files must be pulled/owned by the 'redstoner' user.)*
+
+### Deploying on test server
+* Push all changes
+* Run `<server-dir>/git_pull_utils.sh`.
+* Restart (You can try reloading here, but expect the unexpected)
+
+### Deploying on production server
+* Test all code carefully on the test server  
+  ***on your machine:***
+* `git checkout master`
+* `git pull`
+* `git merge dev`
+* `git push -u origin master`
+* `git checkout dev`  
+  ***on the server:***
+* `rs update_utils`
+* Restart
 
 
 # Modules / Files
-- 
cgit v1.2.3