How to push to staging
Standard Flow
- Before pushing a branch to staging, please rebase your branch with master
- Get the latest version of staging on your local machine
- Switch to staging locally and run :
git merge --squash PM-1111-Your-Branch-Name - Commit your changes to the staging branch
- Restart your local server and make sure nothing is broken
- If all is good, double check that your are still on staging and run:
git push
What happens if there are conflicts?
- WHAT ARE BEST PRACTICES?
Do you actually need to push to staging?
- Will alpha work instead? (should unless you are working with integrations)
- What about using a Feature Branch to test in isolation? https://powr.gitlab.io/docs/engineering/320