Skip to content

Conversation

TomAugspurger
Copy link
Contributor

No description provided.

@TomAugspurger TomAugspurger added this to the 0.25.2 milestone Oct 15, 2019
@jreback jreback added the Docs label Oct 15, 2019
@TomAugspurger
Copy link
Contributor Author

Wait to merge this until #28999 is in (fixing CI on 0.25.2).

@TomAugspurger TomAugspurger mentioned this pull request Oct 15, 2019
@TomAugspurger TomAugspurger merged commit 19c8fad into pandas-dev:master Oct 15, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 15, 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 0.25.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 19c8fad56aa3fc8f683e884f125f042143966b47
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #29000: DOC: 0.25.2 whatsnew cleanup'
  1. Push to a named branch :
git push YOURFORK 0.25.x:auto-backport-of-pr-29000-on-0.25.x
  1. Create a PR against branch 0.25.x, I would have named this PR:

"Backport PR #29000 on branch 0.25.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.

@TomAugspurger
Copy link
Contributor Author

I'll do the manual backport.

@TomAugspurger TomAugspurger deleted the whatsnew-cleanup branch October 15, 2019 13:51
TomAugspurger added a commit to TomAugspurger/pandas that referenced this pull request Oct 15, 2019
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019
bongolegend pushed a commit to bongolegend/pandas that referenced this pull request Jan 1, 2020
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