-
-
Save Mifrill/6d171024f79cb779f8b92b77229fdcd3 to your computer and use it in GitHub Desktop.
hotfix workflow
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# My Heroku git production remote is called 'production' | |
git remote -v | |
# Yields: | |
# | |
# origin git@github.com:Loft47/loft.git (fetch) | |
# origin git@github.com:Loft47/loft.git (push) | |
# production https://git.heroku.com/loft47-prod.git (fetch) | |
# production https://git.heroku.com/loft47-prod.git (push) | |
# staging https://git.heroku.com/vey-staging.git (fetch) | |
# staging https://git.heroku.com/vey-staging.git (push) | |
# First fetch the remote branches from production so that you're up-to-date | |
git fetch production | |
# Checkout a new branch based off the Heroku production master branch | |
git checkout -b bug/something -t production/master | |
# Do your work, then commit it | |
git add . | |
git commit -m 'My hotfix changes' | |
# Push directly to heroku | |
git push production bug/something:master | |
# Merge new commits into master | |
git checkout master | |
git merge bug/something |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment