git pull when branches have diverged