git pull branches diverged