Fighting versus git