git pull diverged branch