Our Git Flow and PR Review

Table of Contents

• Branches
• Branch naming
• PR review

For core development, we use the following structure and flow.

Branches

• Master is the branch for all development and should always be the target of pull requests.
• Each major or minor release has a release branch e.g. release/3.0 or release/3.2. There are no release branches for patch releases.
• Fixes are applied to master, and then cherry picked into the release branch if needed.
• Features that are not for the next release (for major, when next is minor) get labelled 'major' and are left as PRs. They can be approved however.
• Tags get created from release branches when ready to deploy.

Branch naming

Prefixes determine the type of branch, and include:

• fix/
• feature/
• add/
• update/
• release/

When creating a fix branch, use the correct prefix and the issue number. Example:

fix/12345

Alternatively you can summarize the change:

fix/shipping-tax-rate-saving

PR Review

All code merged into master or a release branch must be reviewed by a core maintainer. When ready for review, please request review from your PR. All PRs must be approved before merging and a core maintainer is responsible for merging into master.

Current core maintainers: @donnapep, @alexsanford, @jom, @roundhill

Source: WooCommerce Git Flow