-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
docs: improve gitflow model for supported versions #11378
docs: improve gitflow model for supported versions #11378
Conversation
Currently, supported versions are hosted on `support/<version>`. This bramch is intended to receive all commits and pull requests for compatible patches in order to prepare a release. The release would be made on the same bramch. The issue with this model is that unline latest versions, support versions are not released on a "safe" branch. In order to resolve this issue and harmonize the way versions are prepared and released, the current commit move `support/<version>` to `develop/<version>` and add `master/<version>`. Changes: * Update CONTRIBUTING documentation to describe the `develop/...`+`master/...` approach * Update GitHub pull request template to advise `develop/...` instead
Hm, not sure if master/version makes sense. In general there should be only one master branch imho option, except we support multiple releases at the same time (6.5, 6.6). |
My concern is that support releases (like v6.5.1) should be made on a stable branch, for exactly the same reasons as for standard releases. |
This is the point. v6.5.1 can come after v6.6.0 and cannot use |
Hi @DanielRuf could you give me your opinon on this ? I need it to prepare the v6.5.0-rc.2 release on the correct branch. |
Description
Currently, supported versions are hosted on
support/<version>
. This branch is intended to receive all commits and pull requests for compatible patches in order to prepare a release. The release would be made on the same branch.The issue with this model is that unline latest versions, support versions are not released on a "safe" branch. In order to resolve this issue and harmonize the way versions are prepared and released, the current commit move
support/<version>
todevelop/<version>
and addmaster/<version>
.Changes:
develop/...
+master/...
approachdevelop/...
insteadTypes of changes
functionality to change)
Checklist (all required):
develop
orsupport/*
).