Updated 5. Deploying on our server (markdown)

jomo
2015-01-09 22:05:35 +01:00
parent e756351660
commit 07445f3898

@@ -15,7 +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`
* make sure you go back to dev: `git checkout dev`
0. on the server:
* `rs update_utils`
* now restart to apply changes: `rs restart` (**don't reload!**)