8000 Cleanup backend_bases docs by timhoffm · Pull Request #15874 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Conversation

@timhoffm
Copy link
Member
@timhoffm timhoffm commented Dec 8, 2019

PR Summary

@anntzer
Copy link
Contributor
anntzer commented Dec 8, 2019

(modulo small fix above)

@tacaswell tacaswell modified the milestones: v2.2.5, v3.2.0 Dec 8, 2019
@tacaswell tacaswell merged commit 28be004 into matplotlib:master Dec 8, 2019
@lumberbot-app
Copy link
lumberbot-app bot commented Dec 8, 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.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 28be0049d81643cf361d8df815cdf6d053f186fe
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15874: Cleanup backend_bases docs'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15874-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #15874 on branch v3.2.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.

@tacaswell
Copy link
Member

I'm inclined to abandon backporting this as it would probably require tracking down a few more PRs to also backport.

@timhoffm timhoffm modified the milestones: v3.2.0, v3.3.0 Dec 8, 2019
@timhoffm timhoffm deleted the doc-backend_bases branch December 8, 2019 21:10
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.

3 participants

0