Skip to content

Conversation

@tacaswell
Copy link
Member

PR Summary

This should be manually added to #24186 after this PR is merged.

@tacaswell tacaswell added this to the v3.6-doc milestone Oct 16, 2022
@story645 story645 merged commit d8c1cb0 into matplotlib:main Oct 16, 2022
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 16, 2022

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.6.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 d8c1cb02eab5739225a08ee1ee5d9d3af2835c3f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #24190: DOC: fix markup'
  1. Push to a named branch:
git push YOURFORK v3.6.x:auto-backport-of-pr-24190-on-v3.6.x
  1. Create a PR against branch v3.6.x, I would have named this PR:

"Backport PR #24190 on branch v3.6.x (DOC: fix markup)"

And apply the correct labels and milestones.

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

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

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

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 16, 2022

Something went wrong ... Please have a look at my logs.

It seems that the branch you are trying to backport to does not exist.

@tacaswell tacaswell deleted the doc_fix_markup branch October 17, 2022 18:13
@QuLogic QuLogic modified the milestones: v3.6-doc, v3.6.2 Oct 17, 2022
@QuLogic
Copy link
Member

QuLogic commented Oct 17, 2022

Was manually added to the existing backport #24186

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants