diff --git a/5. Deploying on our server.md b/5. Deploying on our server.md index c3721bd..d5c3dca 100644 --- a/5. Deploying on our server.md +++ b/5. Deploying on our 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`!) \ No newline at end of file