You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Molly Waggett edited this page Mar 3, 2021
·
18 revisions
This document attempts to capture the details of our branching strategy
for Puppet Server. This information is up-to-date as of 2021-03-02.
Puppet Server Branches
Puppet Server has branches that align with Puppet Enterprise and Ruby Puppet.
main for 7.x (or greater) development (Puppet 7 platform, PE 2021.x)
6.x for 6.x development (Puppet 6 platform, PE 2019.8.x)
Main Series
The main series is compatible with the Puppet 7 platform.
6.x Series
The 6.x series is compatible with the Puppet 6 platform.
"Normal" branching workflow
Bug fixes should target the oldest supported series (currently 6.x).
Changes will be automatically merged into newer branches once they go through CI testing.
Usually, most PRs should be targeted at the main branch, which is where feature work will be going on for the next X/Y release.
However, many features and improvements should target and older series.
When in doubt, ask your product owner which series to target.