rebase should use `merge-base` instead of `base_branch`

[ramonsnir]

I believe this will make merge conflicts much simpler.