branch has diverged git