git force pull diverged branch