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 4.3.0 into 5.0.x #988

Merged
merged 6 commits into from
Jan 3, 2023
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 2, 2023

Release Notes for 4.3.0

Feature release (minor)

4.3.0

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

Dependencies,Improvement

Improvement,Minor BC-break

Improvement

Documentation

@Ocramius Ocramius added Improvement Dependencies Pull requests that update a dependency file labels Jan 2, 2023
@Ocramius Ocramius added this to the 5.0.0 milestone Jan 2, 2023
@Slamdunk
Copy link
Collaborator

Slamdunk commented Jan 3, 2023

IMHO this shouldn't be merged at all: composer-normalize shouldn't be pinned in latest major, and 5.x already got a dedicated PR for lcobucci/clock.

@Ocramius
Copy link
Collaborator

Ocramius commented Jan 3, 2023

A merge-up with bits removed should still occur, or otherwise it becomes harder and harder to forward -port patches: specifically important for security issues.

@Slamdunk
Copy link
Collaborator

Slamdunk commented Jan 3, 2023

I figured it, but how to remove the bits?

@Ocramius
Copy link
Collaborator

Ocramius commented Jan 3, 2023

We do a git merge --no-ff 5.0.x locally, and adjust the final code before committing the merge 👍

@Slamdunk
Copy link
Collaborator

Slamdunk commented Jan 3, 2023

I hope I did it right

@Ocramius
Copy link
Collaborator

Ocramius commented Jan 3, 2023

Excellent, thanks! 👍

@Ocramius Ocramius self-assigned this Jan 3, 2023
@Ocramius Ocramius merged commit 115d94a into 5.0.x Jan 3, 2023
@Ocramius Ocramius deleted the 4.3.x-merge-up-into-5.0.x_oz3q1lJV branch January 3, 2023 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Pull requests that update a dependency file Improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants