branches have diverged git