Dealing with diverged git branches