Skip to content

Conversation

@trexfeathers
Copy link
Contributor

@trexfeathers trexfeathers commented Feb 21, 2023

Use a merge commit (not a squash)

The only material difference between v3.4.x and main is the v3.4.1 patch section on the What's New. Everything else is just what it took to port #5095 across, get the CI passing, and resolve conflicts, so I haven't included any of that complication here.

@trexfeathers trexfeathers added the Type: Merge Back Merging a feature branch back to main label Feb 21, 2023
Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

Looks good.

@stephenworsley stephenworsley merged commit d63e629 into SciTools:main Feb 21, 2023
@trexfeathers trexfeathers deleted the whatsnew_341 branch February 24, 2023 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Merge Back Merging a feature branch back to main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants