Skip to content

Fix versions in Upgrading Major Version #13029

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

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Conversation

BenMorel
Copy link
Contributor

@BenMorel BenMorel commented Feb 3, 2020

This PR fixes the versions of the upgrade: 4.4 -> 5.0 instead of 4.3 -> 4.4.

I'm also suggesting a change to the following wording:

(...) follow their own versioning scheme.

to make the sentence clearer.

Copy link
Contributor

@HeahDude HeahDude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for that PR!

It seems that a block below is duplicated, could you please remove the lines 155 to 167, then add the diff on line 177 too?

You can also target 4.4 for this fix, or we can do it for you on merge.

@HeahDude HeahDude added this to the 4.4 milestone Feb 4, 2020
@BenMorel
Copy link
Contributor Author

BenMorel commented Feb 4, 2020

@HeahDude Done!

I can target 4.4, but then you'd have to merge it to master as well, am I mistaken?

@OskarStark
Copy link
Contributor

We merge this afterwards to master

Copy link
Contributor

@HeahDude HeahDude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@BenMorel
Copy link
Contributor Author

BenMorel commented Feb 4, 2020

So should I retarget to 4.4?

@HeahDude
Copy link
Contributor

HeahDude commented Feb 4, 2020

You can if you want, but we use an internal tool to merge PRs and can do it otherwise, thanks.

@OskarStark OskarStark changed the base branch from master to 4.4 February 5, 2020 05:55
@OskarStark
Copy link
Contributor

Thank you Benjamin.

OskarStark added a commit that referenced this pull request Feb 5, 2020
This PR was submitted for the master branch but it was squashed and merged into the 4.4 branch instead (closes #13029).

Discussion
----------

Fix versions in Upgrading Major Version

This PR fixes the versions of the upgrade: `4.4 -> 5.0` instead of `4.3 -> 4.4`.

I'm also suggesting a change to the following wording:

> (...) follow their own versioning scheme.

to make the sentence clearer.

Commits
-------

19e1ec7 Fix versions in Upgrading Major Version
@OskarStark OskarStark merged commit 19e1ec7 into symfony:4.4 Feb 5, 2020
@BenMorel BenMorel deleted the patch-1 branch February 5, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants