git pull branches have diverged