Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: Fix dependency link. #20876

Merged
merged 1 commit into from
Aug 23, 2021
Merged

Conversation

timhoffm
Copy link
Member

The dependency list has been moved in version 3.4.

The dependency list has been moved in version 3.4.
@timhoffm timhoffm added this to the v3.4-doc milestone Aug 23, 2021
@dstansby dstansby merged commit 2f140ff into matplotlib:master Aug 23, 2021
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 23, 2021

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

"Backport PR #20876 on branch v3.4.3-doc (DOC: Fix dependency link.)"

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 remove Still Needs Manual Backport label once the PR gets merged.

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

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 23, 2021

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

"Backport PR #20876 on branch v3.4.x (DOC: Fix dependency link.)"

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 remove Still Needs Manual Backport label once the PR gets merged.

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

@QuLogic
Copy link
Member

QuLogic commented Aug 24, 2021

3.4 doesn't have this link, because it would link to itself, so this doesn't need a backport.

@QuLogic QuLogic modified the milestones: v3.4-doc, v3.5.0 Aug 24, 2021
@timhoffm timhoffm deleted the fix-dependency-link branch August 24, 2021 08:52
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