BUG: DataFrame.align bug with join keyword (GH13914)
- [x] closes #13194
- [x] tests added / passed
- [x] passes `git diff upstream/master | flake8 --diff`
- [x] whatsnew entry

@jreback Is this okay?
 in the future, simply push to the SAME PR, don't open new ones for the same thing. ok for now.
 @jreback Implemented all of your comments. Hope it's fine now. 
Regarding to the PR push activities, I'll keep it in mind. 
 @MaximilianR It was a typo. Fixed it.
 @jreback I think I have it this time. Is this method right?
 can you rebase / update
 @jreback 
You mean 
`git checkout bug13207`
`git rebase master`
`git push origin bug13207`

Right?
 yes, see docs [here](http://pandas.pydata.org/pandas-docs/stable/contributing.html#combining-commits)
 @jreback Done. I hope this is alright.
 I don't see any changes, you need to `git push yourbranchname -f`
 I did a `git push origin bug13207 -f`

If I do a `git push bug13207 -f` it says
 Please make sure you have the correct access rights
and the repository exists
 you cannot push to origin you need to push to your fork
 My origin is set as my forked repo.

`git remote -v`

Output:  
origin  git@github.com:pfrcks/pandas.git (fetch)
origin  git@github.com:pfrcks/pandas.git (push)
 @pfrcks : You can set your local branch to track your origin version by doing the following:

```
git push -u origin <branch_name>
```

From then on, you can just do `git push -f` or `git push`
 @gfyoung I have followed the comments you gave.

It gives "Everything up-to-date" as output.
 @pfrcks: that's perfectly fine!  That's because your local branch is sync'ed with your remote branch with the same name.  You can now see that by typing `git status`
 can you rebase / update?
 You should `git merge --squash`, commit that, `git reset --hard upstream/master`, then cherry pick the merged commit. That will clean up the merge commit etc. 
 I am currently on bug13207 branch that I have created.
Issuing `git merge --squash` gives `(nothing to squash)Already up-to-date.`

I followed the rest of the steps and have again pushed the branch using `git push -f origin bug13207`
 @pfrcks Possibly your upstream master was not updated? (in any case, although you say you force pushed, no new/rebased commits are in this PR and there are still conflicts, so something went wrong). Can you do 

```
git fetch upstream
```

before rebasing/merging? And then force push again?
 can you rebase this on master I rebased.

`git fetch origin`
`git rebase origin/master` can you rebase, move release note to 0.20.0 closing as stale