Updated 5. Deploying on our server (markdown)

2015-01-09 21:27:49 +01:00
parent d0734f92ca
commit 3f41dfaf94
1 changed files with 2 additions and 3 deletions
--- a/server.md
+++ b/server.md
@@ -13,9 +13,8 @@ The test server uses the *dev* branch, the production server uses *master*.
 ### Deploying on production server
 0. Test all code carefully on the test server
 0. on your machine:
-  * pull
-  * merge *dev* into *master*
-  * push
+  * `git pull --all && git checkout master && git merge dev`
+  * when you get no errors: `git push`
 0. on the server:
  * `rs update_utils`
  * Restart (**don't** `/reload`!)