Reputation: 15117
My friend released our staging environment to heroku and gave me permission to release as well. However, I am not sure how to setup an existing heroku app, in order to merge my dev branch into staging and then release it?
For example,
$ git remote -v
origin [email protected]:SC/SCTest.git (fetch)
origin [email protected]:SC/SCTest.git (push)
staging [email protected]:robot-6850.git (fetch)
staging [email protected]:robot-6850.git (push)
$ git branch -v
* master ec8c252 survey finalize
So, essentially, I would like to 1) map the 'staging' remote to a local branch of mine, 2) merge my dev branch 'origin' into 'staging' and 3) release 'staging' again but am not really sure how to do this? Any thoughts?
Upvotes: 1
Views: 116
Reputation: 37507
Work in your local 'dev' branch locally.
When you are ready to deploy merge this branch into your staging branch and then deploy your staging branch to your heroku application.
git push staging staging:master
This is instructing Git to push your local staging branch into the master branch (heroku only deploys a master branch) of the staging remote (ie robot-6850 application)
More info in Deploying with Git on Dev Center
Upvotes: 1