REGR: preserve freq in DTI/TDI outer join by jbrockmendel · Pull Request #32166 · pandas-dev/pandas (original) (raw)

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.0.x
$ git pull

1. Cherry pick the first parent branch of the this PR on top of the older branch:

$ git cherry-pick -m1 27f0000804072e8d65e6c7939ec09069e1b9790e

1. You will likely have some merge/cherry-pick conflict here, fix them and commit:

$ git commit -am 'Backport PR #32166: REGR: preserve freq in DTI/TDI outer join'

1. Push to a named branch :

git push YOURFORK 1.0.x:auto-backport-of-pr-32166-on-1.0.x

1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #32166 on branch 1.0.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.