Skip to content

Commit 91fdd2e

Browse files
authored
Explain branching strategy
1 parent 02d4c8f commit 91fdd2e

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

CONTRIBUTING.md

+6
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ There are number of ways to contribute, it is not only about coding! You can rea
2121
[osl]: https://opensource.org/licenses/OSL-3.0
2222
[afl]: https://opensource.org/licenses/AFL-3.0
2323
[get-involved]: https://www.prestashop-project.org/get-involved/
24+
25+
### Branches
26+
27+
The PrestaShop project adopts [our own flavor of git flow branching strategy](https://build.prestashop-project.org/news/2015/introducing-new-branching-model-prestashop/).
28+
29+
tl;dr Put bug fixes in 8.x or [other supported branches](https://github.com/PrestaShop/PrestaShop/branches), put new compatible and incompatible features in [the develop branch](https://github.com/PrestaShop/PrestaShop).

0 commit comments

Comments
 (0)