From e756351660ae6745e23862784ddb7c43fa3daad4 Mon Sep 17 00:00:00 2001 From: jomo Date: Fri, 9 Jan 2015 22:05:25 +0100 Subject: [PATCH] Updated 5. Deploying on our server (markdown) --- 5. Deploying on our server.md | 1 + 1 file changed, 1 insertion(+) diff --git a/5. Deploying on our server.md b/5. Deploying on our server.md index de51984..ad23f99 100644 --- a/5. Deploying on our server.md +++ b/5. Deploying on our 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!**) \ No newline at end of file