Skip to content

Instantly share code, notes, and snippets.

@mrchief
Last active June 26, 2020 14:52
Show Gist options
  • Save mrchief/36395d2f9169a908e4a59014649c640c to your computer and use it in GitHub Desktop.
Save mrchief/36395d2f9169a908e4a59014649c640c to your computer and use it in GitHub Desktop.
# πŸ’€ 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