Skip to content

Conversation

0golovatyi
Copy link
Contributor

Copying changes from master made by @WillAyd.

Lesson learned - do not git cherry-pick unless you want to end up with merging conflicts which are harder to solve then manually duplicate all necessary changes.

@pep8speaks
Copy link

pep8speaks commented Mar 28, 2019

Hello @0golovatyi! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2019-03-28 22:30:19 UTC

@WillAyd
Copy link
Contributor

WillAyd commented Mar 28, 2019

Lesson learned - do not git cherry-pick unless you want to end up with merging conflicts which are harder to solve then manually duplicate all necessary changes.

Ha whoops sorry about that. Typically should work well but if you want to try again in the future let me know can see if I can help

@johng42
Copy link
Contributor

johng42 commented Mar 29, 2019

CC drop is expected since some single lines are broken into multiple lines by PEP changes

@johng42 johng42 merged commit 875de6b into dev Mar 29, 2019
@johng42 johng42 deleted the dev_flake8_server branch March 29, 2019 15:55
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.

5 participants