Yi Zhang has been pulled and future remote updates would overwrite local changes. You can override this to make sure that future remote updates will be ignored so your local changes persist. Resetting ...