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

Merge release 2.26.0 into 3.0.x #177

Merged
merged 6 commits into from
Dec 12, 2023
Merged

Conversation

github-actions[bot]
Copy link

Release Notes for 2.26.0

Feature release (minor)

2.26.0

  • Total issues resolved: 0
  • Total pull requests resolved: 1
  • Total contributors: 1

Enhancement

renovate bot and others added 5 commits April 18, 2023 01:22
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Renovate Bot <[email protected]>
Signed-off-by: Renovate Bot <[email protected]>
Update PHP constraints to allow v8.3
@Ocramius Ocramius self-assigned this Nov 2, 2023
@Ocramius Ocramius added this to the 3.0.1 milestone Nov 2, 2023
@Ocramius
Copy link
Member

Ocramius commented Nov 2, 2023

I think that the cleanest approach here is to merge-up with no changes, as in resetting HEAD to 3.0.x and having the merge commit with an empty diff, leading therefore to a clean merge-up in future.

Also means that we don't need to do any releases: all security fixes from 2.x would smoothly go up to 3.x too

@gsteel
Copy link
Member

gsteel commented Dec 12, 2023

I think that the cleanest approach here is to merge-up with no changes, as in resetting HEAD to 3.0.x and having the merge commit with an empty diff, leading therefore to a clean merge-up in future.

Also means that we don't need to do any releases: all security fixes from 2.x would smoothly go up to 3.x too

@Ocramius

So just checkout this branch, git reset hard to 3.0.x, force push and then release 3.0.1, and subsequently 3.1.x, 3.2.x and 3.3.x after all the clean merge-ups are made?

@Xerkus Xerkus changed the base branch from 3.0.x to 3.4.x December 12, 2023 13:07
@Xerkus
Copy link
Member

Xerkus commented Dec 12, 2023

No. Merge up into latest with no effective changes. I'll do this.

@Xerkus Xerkus merged commit f04b629 into 3.4.x Dec 12, 2023
27 checks passed
@Xerkus Xerkus deleted the 2.26.x-merge-up-into-3.0.x_In5VrPdM branch December 12, 2023 13:20
@Xerkus Xerkus removed this from the 3.0.1 milestone Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants