Skip to content

Merge release 4.3.0 into 5.0.x#988

Merged
Ocramius merged 6 commits into
5.0.xfrom
4.3.x-merge-up-into-5.0.x_oz3q1lJV
Jan 3, 2023
Merged

Merge release 4.3.0 into 5.0.x#988
Ocramius merged 6 commits into
5.0.xfrom
4.3.x-merge-up-into-5.0.x_oz3q1lJV

Conversation

@github-actions

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

Copy link
Copy Markdown
Contributor

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

Slamdunk commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

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

Ocramius commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

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

Slamdunk commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

I figured it, but how to remove the bits?

@Ocramius

Ocramius commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

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

@Slamdunk

Slamdunk commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

I hope I did it right

@Ocramius

Ocramius commented Jan 3, 2023

Copy link
Copy Markdown
Collaborator

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