do a rebase from the upstream branch