Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Fix flake8 from #21335#21361

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
QuLogic merged 1 commit intomatplotlib:masterfromtimhoffm:fix-flake8
Oct 15, 2021
Merged

Conversation

timhoffm
Copy link
Member

No description provided.

@timhoffmtimhoffm added this to thev3.5.0 milestoneOct 15, 2021
@timhoffmtimhoffm changed the titleFix flake8 from #21360Fix flake8 from #21335Oct 15, 2021
@QuLogic
Copy link
Member

The commit message is also wrong.

@timhoffm
Copy link
MemberAuthor

Sorry, I’m away from my PC and cannot update the message. Feel free to push over or merge as is (after all, the commit id is from the backport, so it’s only half off).

@QuLogicQuLogic merged commit7c6d9eb intomatplotlib:masterOct 15, 2021
@lumberbot-app
Copy link

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.5.x$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 7c6d9ebd1400434a4d67143ff4bf682677ca7e2e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #21361: Fix flake8 from #21335'
  1. Push to a named branch :
git push YOURFORK v3.5.x:auto-backport-of-pr-21361-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR#21361 on branch v3.5.x (Fix flake8 from#21335)"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to removeStill Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free tosuggest an improvement.

@QuLogic
Copy link
Member

I'll just throw the fix into the existing backport in#21360.

@timhoffmtimhoffm deleted the fix-flake8 branchOctober 15, 2021 06:35
tacaswell pushed a commit that referenced this pull requestOct 20, 2021
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@QuLogicQuLogicQuLogic approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.

2 participants
@timhoffm@QuLogic

[8]ページ先頭

©2009-2025 Movatter.jp