mirror of
https://github.com/doctrine/orm.git
synced 2026-03-23 22:42:18 +01:00
🥔 Should we keep rebasing 3.0? #6052
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Originally created by @guilhermeblanco on GitHub (Aug 28, 2018).
@doctrine/doctrinecore Feel free to vote.
👍 For "Yes, continue"
👎 For "Stop, let's choose another alternative (ie. merge, cherry-pick)"
@Ocramius commented on GitHub (Aug 28, 2018):
As discussed in chat, this is currently problematic: we'll most likely need to consider all branches under a certain naming convention (such as
(master|\d+.\d+\.x)) as stable.@lcobucci commented on GitHub (Aug 28, 2018):
We now have 151 PRs targeting
master, 30 PRs targeting2.6, and 8 PRs targeting2.7- we have other PRs for older branches but let's just skip them 😜.I'm pretty sure most of the 151 are already outdated and need to be rebased, but even thought that's the situation I think we should strive to consider
masteras a stable branch as much as possible.With the current state of the repo, it's way easier to port a bugfix forward to
masterthan keep it rebasing it.@Majkl578 commented on GitHub (Aug 28, 2018):
On top of what @lcobucci said, I'd also like to mention that 2.6 vs master is not just a few commits and changed files, but a lot of fundamental changes and completely overhauled coding style.
Right now
2.6...master:1524 files changed, 61877 insertions(+), 78432 deletions(-)@SenseException commented on GitHub (Sep 6, 2018):
What @Majkl578 says is especially interesting for documentation, that needs to be changed on multiple branches. Currently 2.6 - 3.0, in case changes affects all those versions. We have outdated information in the docs that should get focus like #7374 and #7385.
@beberlei commented on GitHub (Dec 6, 2020):
Internal question for discussion group.