Revert 5.2.0 backports prior to 6.0.0 merge #403
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit e3c9bcc.
Merged
|
@bighappyface I'm aware that this is a PR against master, rather than against If you don't like it, let me know, and I'll go back to the other approach. |
|
maybe the v6.0.0 branch should be the master branch ? and backports to v5.x only happen in 5.x.x ? |
|
@mathroc It's about to be - that's the whole point of this PR, and is why 5.x.x was created. This PR allows all of 6.0.0-dev to merge into master smoothly, without needing to orphan the 5.2.0 release which had already gone out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Revert commit e3c9bcc to allow 6.0.0-dev to merge smoothly.
This seems like a much cleaner approach than messing with
6.0.0-devand either having tons of duplicate commits, or losing commit history there. This way, all that needs to happen prior to6.0.0-devbeing merged, is merging this one to master.Why
Because @bighappyface asked me to solve the 6.0.0 merge conflict.