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

Backport fixes to 2.0 #686

Merged
merged 24 commits into from
Aug 15, 2019
Merged

Backport fixes to 2.0 #686

merged 24 commits into from
Aug 15, 2019

Conversation

barryvdh
Copy link
Contributor

As fas as I can tell, none of these changes are breaking / big features, so can be merged to 2.0

@barryvdh barryvdh mentioned this pull request Aug 15, 2019
@driesvints
Copy link
Member

@barryvdh seems like you're trying to merge in all commits from the master branch. You should try to only cherry-pick the commits from the feature. Can you try a new PR?

@driesvints driesvints closed this Aug 15, 2019
@barryvdh
Copy link
Contributor Author

I was indeed trying to merge all the commits from master, because they are all bugfixes and should probably be in 2.0? Or which one should I exclude?
I can cherry-pick some, but not sure which you don't want.

@driesvints
Copy link
Member

@barryvdh I wasn't aware that you sent in more prs. I suggest that you sent in the same prs that you sent to the 3.0 branch also to the 2.0 branch.

@barryvdh
Copy link
Contributor Author

But that would make the history even more confusing, with diverted paths? And some other changes that were not mine.

But anyways, my changes aren't that important (mostly usability/small features) that they have to be in it NOW, so I'll just leave it as is. Not sure what the timing of 3.0 is going to be.

@driesvints driesvints reopened this Aug 15, 2019
@driesvints
Copy link
Member

Hey @barryvdh. I talked to Taylor about this and this seems good to be merged. Thanks for sending this in 👍

@driesvints driesvints merged commit b381270 into 2.0 Aug 15, 2019
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.

8 participants