Skip to content
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

🥔 Should we keep rebasing 3.0? #7379

Closed
guilhermeblanco opened this issue Aug 28, 2018 · 5 comments
Closed

🥔 Should we keep rebasing 3.0? #7379

guilhermeblanco opened this issue Aug 28, 2018 · 5 comments

Comments

@guilhermeblanco
Copy link
Member

@doctrine/doctrinecore Feel free to vote.

👍 For "Yes, continue"
👎 For "Stop, let's choose another alternative (ie. merge, cherry-pick)"

@Ocramius
Copy link
Member

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
Copy link
Member

lcobucci commented Aug 28, 2018

We now have 151 PRs targeting master, 30 PRs targeting 2.6, and 8 PRs targeting 2.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 master as a stable branch as much as possible.

With the current state of the repo, it's way easier to port a bugfix forward to master than keep it rebasing it.

@Majkl578
Copy link
Contributor

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
Copy link
Member

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
Copy link
Member

beberlei commented Dec 6, 2020

Internal question for discussion group.

@beberlei beberlei closed this as completed Dec 6, 2020
@greg0ire greg0ire removed this from the 3.0.0 milestone Jun 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

7 participants