Git Flow - hackoregon/disaster-resilience GitHub Wiki
We have three basic branches
- staging- check into this branch to push to production
- develop- this is the branch currently in development. This is the default branch.
- feature branch - this is each person's local branch for feature changes
Workflow:
- Someone decides to work on a feature
- They branch from develop into feature branch
- They develop & test the feature
- After testing, they send a pull request into the branch develop
- Someone else on the team reviews the changes and approves
- The developer merges into develop branch
- Devops merges into staging - which is pushed to production
The main two rules are this
- DO NOT EVER commit or merge to master without an approved PR
- Merge changes to test from your feature branch onto staging Commits to staging branch will (probably) automatically push to staging environment