Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Updated 5. Deploying on our server (markdown)

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