BUG: dt+BDay(n) wrong if n>5, n%5==0 and dt not on offset (GH5890)

[dd137]

closes #5890

[jreback]

looks good...pls do a rebase on master and can merge it....

[dd137]

Hi,
When I do "git rebase upstream/master" I get "Current branch bday-addition is up to date."
Not sure if I need to do something more/else?

[jreback]

sorry

git fetch upstrem
git rebase upstream/master

see here:

https://github.com/pydata/pandas/wiki/Using-Git

[dd137]

Yeah this is what I had done before and git is saying the branch is up to date, hence I'm thinking I'm done on my side. Is that correct or do I need to do something more? Sorry for the confusion

[jreback]

it can't be automatically merged prob a conflict on release.rst

did you push it after?

git push origin mybranchname -f?

[jreback]

you can also try this

git branch mybranchname -set-upstream origin/master

it might not be looking at right tracking branch (iow you are rebaseing to your own branch)

[dd137]

Ah I see thanks. I think it worked this time (I've had to solve the conflicts in release.rst)

[jreback]

thanks!