Skip to content

DOC: Fix release note typo #36670

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

Merged
merged 1 commit into from
Sep 26, 2020
Merged

DOC: Fix release note typo #36670

merged 1 commit into from
Sep 26, 2020

Conversation

dsaxton
Copy link
Member

@dsaxton dsaxton commented Sep 26, 2020

No description provided.

@simonjayhawkins simonjayhawkins added this to the 1.1.3 milestone Sep 26, 2020
Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dsaxton merge when green-ish

@dsaxton dsaxton merged commit fe09a17 into pandas-dev:master Sep 26, 2020
@dsaxton dsaxton deleted the fix-typo branch September 26, 2020 16:51
@lumberbot-app
Copy link

lumberbot-app bot commented Sep 26, 2020

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 1.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 fe09a17e865995ddfe4e617031e382cd1321586a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #36670: DOC: Fix release note typo'
  1. Push to a named branch :
git push YOURFORK 1.1.x:auto-backport-of-pr-36670-on-1.1.x
  1. Create a PR against branch 1.1.x, I would have named this PR:

"Backport PR #36670 on branch 1.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.

@simonjayhawkins
Copy link
Member

probably need to wait till #36669 merged to do backport.

@dsaxton
Copy link
Member Author

dsaxton commented Sep 26, 2020

probably need to wait till #36669 merged to do backport.

Ok, should I go ahead and open the backport PR? I have it ready.

@simonjayhawkins
Copy link
Member

yep. likely have conflicts if created b4 merge.

@simonjayhawkins
Copy link
Member

it's typically that normally need to trigger the backport and when you don't want it, it works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants