Updated 5. Deploying on our server (markdown)

2015-01-09 22:05:25 +01:00
parent ed9b3055e7
commit e756351660
1 changed files with 1 additions and 0 deletions
--- a/server.md
+++ b/server.md
@@ -15,6 +15,7 @@ The test server uses the *dev* branch, the production server uses *master*.
 0. on your machine:
  * `git pull --all && git checkout master && git merge dev`
  * when you get no errors: `git push`
+  * make sure you got back to dev: `git checkout dev`
 0. on the server:
  * `rs update_utils`
  * now restart to apply changes: `rs restart` (**don't reload!**)