Last active
June 26, 2020 14:52
-
-
Save mrchief/36395d2f9169a908e4a59014649c640c to your computer and use it in GitHub Desktop.
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
# π DO NOT MAKE ANY COMMITS to master directly - they should always come from rebasing develop | |
# π ensure ALL actions in develop are GREEN β | |
# ensure you have no pending changes locally | |
git pull origin develop | |
# make sure you have no pending changes locally | |
git pull origin master | |
git checkout master | |
git rebase develop master | |
# after this step: | |
# master should be ahead of develop by n commits | |
# there should be no conflicts | |
# πππ if there are conflicts, then something in your workspace is not clean. | |
# πππ undo everything and start again | |
git push origin master | |
# keep an eye on prod deploy and make sure all actions go GREEN β | |
# if things break, fix them in develop first and then repeat the process | |
# if you want to rollback, git reset n commits and push again. this will be a force push but that's fine. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment