what to do in case of diverging branch after a rebase