2023-11-29 18:48:05 +00:00
|
|
|
---
|
|
|
|
post_title: WooCommerce Git flow
|
2024-01-16 19:29:00 +00:00
|
|
|
menu_title: WooCommerce Git flow
|
|
|
|
tags: reference
|
2023-11-29 18:48:05 +00:00
|
|
|
---
|
2023-10-23 21:00:26 +00:00
|
|
|
|
|
|
|
For core development, we use the following structure and flow.
|
|
|
|
|
2024-01-22 18:13:17 +00:00
|
|
|
![Git Flow WooCommerce uses for core development](https://developer.woo.com/wp-content/uploads/2023/12/flow-1.png)
|
2023-10-23 21:00:26 +00:00
|
|
|
|
|
|
|
## Branches
|
|
|
|
|
|
|
|
* **Trunk** 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 trunk, and then **cherry picked into the release branch if needed**.
|
|
|
|
* 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:
|
|
|
|
|
2024-01-18 14:38:23 +00:00
|
|
|
```text
|
2023-10-23 21:00:26 +00:00
|
|
|
fix/12345
|
|
|
|
```
|
|
|
|
|
|
|
|
Alternatively you can summarise the change:
|
|
|
|
|
2024-01-18 14:38:23 +00:00
|
|
|
```text
|
2023-10-23 21:00:26 +00:00
|
|
|
fix/shipping-tax-rate-saving
|
|
|
|
```
|