OL: how to merge and deploy a pull request
First to freeze eventually local updates:
git stash |
load locally the pull request code patch
git checkout -b bmmcginty-overdriveSearchUrlChange master git pull https://github.com/bmmcginty/openlibrary.git overdriveSearchUrlChange |
mind to test the code and not just merge it from git website
git checkout master git merge --no-ff bmmcginty-overdriveSearchUrlChange git push origin master (pushing on my repo) git push archive master (pushing on archive repo) |
now you can deploy the code
to deploy openlibrary
to all nodes:
/olsystem/bin/deploy-code openlibrary |
to deploy olsystem
to all nodes:
/olsystem/bin/deploy-code olsystem |