When herding cats, change branches and THEN pull.