8000 Fix ReST note in span selector example by timhoffm · Pull Request #14422 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Conversation

@timhoffm
Copy link
Member
@timhoffm timhoffm commented Jun 2, 2019

PR Summary

Follow up fix for #14285.

@efiring efiring merged commit 918b691 into matplotlib:master Jun 3, 2019
@lumberbot-app
Copy link
lumberbot-app bot commented Jun 3, 2019

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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 918b6916e3c1325cd6d1779ba937628ab53457e7
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14422: Fix ReST note in span selector example'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14422-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #14422 on branch v3.1.x"

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!

If these instruction are inaccurate, feel free to suggest an improvement.

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jun 3, 2019
QuLogic added a commit that referenced this pull request Jun 3, 2019
…422-on-v3.1.0-doc

Backport PR #14422 on branch v3.1.0-doc (Fix ReST note in span selector example)
@matplotlib matplotlib deleted a comment Jun 3, 2019
@timhoffm timhoffm deleted the fix-span-selector-note branch June 4, 2019 23:12
@timhoffm
Copy link
Member Author
timhoffm commented Jun 4, 2019

@meeseeksdev backport to v3.1.x

This should backport cleanly. Was problably failing above because the backports of the original #14285 had not yet been merged.

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jun 4, 2019
jklymak added a commit that referenced this pull request Jun 5, 2019
…422-on-v3.1.x

Backport PR #14422 on branch v3.1.x (Fix ReST note in span selector example)
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.

2 participants

0