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

Fix a merge issue that didn't get caught by Brown Truck #8464

Merged
merged 1 commit into from Jun 18, 2020

Conversation

pfmoore
Copy link
Member

@pfmoore pfmoore commented Jun 18, 2020

A problem with #8394 caused by another PR that got merged first. Didn't cause a merge conflict, so it didn't get picked up by Brown Truck.

@pfmoore pfmoore added the skip news Does not need a NEWS file entry (eg: trivial changes) label Jun 18, 2020
@pfmoore pfmoore requested a review from pradyunsg June 18, 2020 13:04
@pradyunsg
Copy link
Member

Hah. I am definitely wondering if we need to start using bors.

@pfmoore
Copy link
Member Author

pfmoore commented Jun 18, 2020

/me goes and looks up bors.

Quite possibly :-)

Actually, it also made me think that we don't really test the code behind this new message. Mostly because I don't want to be adding tests that depend on the precise wording of error messages, but I have no idea how to test the code behind the message without doing just that.

One for another day, I think...

@pradyunsg pradyunsg merged commit 1c6f438 into pypa:master Jun 18, 2020
@pfmoore
Copy link
Member Author

pfmoore commented Jun 18, 2020

Thanks!

@pfmoore pfmoore deleted the nr_lintfix branch June 18, 2020 13:42
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
skip news Does not need a NEWS file entry (eg: trivial changes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants