Be careful with this command. After running it, new changes are immediately live!
In the background it syncs the files from your rebelmouse folder to a copy of our repo, then we run git pull and we check for merge errors, if everything is ok, we commit new changes to our master branch and finally we push to prod.
You can run this command only on master branch.
Be careful. If there are any changes on master branch then roar-push-prod will start its process immediately. Expecting you are working in a feature branch these commands below are recommended to run to push a branch live.
git checkout mastergit pull --rebaseroar-fetchgit statusgit commit -am "updates from RM repo"git push origin mastergit merge --no-ff 12345-new_branch_nameroar-reloadroar-push-prod "A meaningful message explaining new updates."
Before first push please read Daily workflow example in GIT Workflow topic where it is explained what these commands do.
Deploy can be locked by other (yours or RebelMouse) developers at any time. You can't deploy in the meantime when someone else does. You will receive an email when deploy will be free again.
Deploy can take up to 20 min to be finished.
In the process of deploying your merged branch will be also pushed to BitBucket origin.
Important: In case you merged your feature branch to master already and you need to roar-fetch again because of a some reason (for example deploy was blocked and someone pushed new changes to your repo), then you need to get your feature branch off the master branch before running roar-fetch. Otherwise your changes could get lost (when changes are in the same file as you were working on). Workflow:
# you are on master and ready for deploygit merge --no-ff 12345-new_branch_nameroar-push-prod "A meaningful message explaining new updates."# deploy is blocked# you receive a mail after while that deploy is freeroar-push-prod "A meaningful message explaining new updates."# you receive a message back that there are new changes which you need to fetch# get your feature branch off the master with combination of next three commands - it will clear your branch of any changesgit checkout .git reset --hard origin/mastergit clean -fd# you are now ready for roar-fetchroar-fetch# there will be new changes which you need to commit and push to origingit commit -am "updates from RM repo"git push origin master# your master is now synced with latest code# you can start this procedure once again from the beginning