GIT: Developer Workflow
Branch structure
Master (Protected, team lead only)
Staging (Protected, reviewers)
Development (Only pull requests are allowed)
Feature (Developer can work here)
Workflow
Developer works in feature branch (the branch must be named based on the feature working on).
Create pull request on Development branch.
Must pass automatic checks: PHP Stan, Code Sniffer (PSR-2), JS Linter.
Pull request will be reviewed manually by team lead (only if point 3 will pass).
If everything goes ok, the pull request will be merged to development.
Feature branch will be removed.
Developers must be in sync with Development branch.
Team lead will copy the work manually from development to staging, selecting the features that we need to put in production.
After the customer approval, from staging, the changes must be sent to master.
With a manual release, master branch will be deployed to production.
Review Process
1. If the pull request pass all checks (see workflow point 3), a manual review is needed. 2. If something isn't right, the reviewer must reject the pull request based on company best practices, otherwise must provide strong reasons for the rejection. 3. If the reviewer doesn't see anything wrong, the pull request will get accepted and the work will move on to the next stage.
Last updated