git rebase have diverged