[Bug]: error: The following untracked working tree files would be overwritten by checkout:

genbobo commented 9 months ago

Is there an existing issue for this?

[X] I have searched the existing issues and checked the recent builds/commits

What happened?

Fetching updates for Stable Diffusion XL... Checking out commit for Stable Diffusion XL with hash: 45c443b316737a4ab6e40413d7794a7f5657c19f... error: The following untracked working tree files would be overwritten by checkout: .github/workflows/black.yml .github/workflows/test-build.yaml .github/workflows/test-inference.yml CODEOWNERS LICENSE-CODE assets/001_with_eval.png model_licenses/LICENSE-SDXL0.9 model_licenses/LICENSE-SDXL1.0 pyproject.toml pytest.ini requirements/pt13.txt requirements/pt2.txt scripts/tests/attention.py sgm/inference/api.py sgm/inference/helpers.py sgm/modules/autoencoding/lpips/init.py sgm/modules/autoencoding/lpips/loss/.gitignore sgm/modules/autoencoding/lpips/loss/LICENSE sgm/modules/autoencoding/lpips/loss/init.py sgm/modules/autoencoding/lpips/loss/lpips.py sgm/modules/autoencoding/lpips/model/LICENSE sgm/modules/autoencoding/lpips/model/init.py sgm/modules/autoencoding/lpips/model/model.py sgm/modules/autoencoding/lpips/util.py sgm/modules/autoencoding/lpips/vqperceptual.py tests/inference/test_inference.py Please move or remove them before you switch branches.

Steps to reproduce the problem

Go to ....
Press ....
...

What should have happened?

update

Sysinfo

Fetching updates for Stable Diffusion XL... Checking out commit for Stable Diffusion XL with hash: 45c443b316737a4ab6e40413d7794a7f5657c19f... error: The following untracked working tree files would be overwritten by checkout: .github/workflows/black.yml .github/workflows/test-build.yaml .github/workflows/test-inference.yml CODEOWNERS LICENSE-CODE assets/001_with_eval.png model_licenses/LICENSE-SDXL0.9 model_licenses/LICENSE-SDXL1.0 pyproject.toml pytest.ini requirements/pt13.txt requirements/pt2.txt scripts/tests/attention.py sgm/inference/api.py sgm/inference/helpers.py sgm/modules/autoencoding/lpips/init.py sgm/modules/autoencoding/lpips/loss/.gitignore sgm/modules/autoencoding/lpips/loss/LICENSE sgm/modules/autoencoding/lpips/loss/init.py sgm/modules/autoencoding/lpips/loss/lpips.py sgm/modules/autoencoding/lpips/model/LICENSE sgm/modules/autoencoding/lpips/model/init.py sgm/modules/autoencoding/lpips/model/model.py sgm/modules/autoencoding/lpips/util.py sgm/modules/autoencoding/lpips/vqperceptual.py tests/inference/test_inference.py Please move or remove them before you switch branches.

What browsers do you use to access the UI ?

No response

Console logs

Fetching updates for Stable Diffusion XL...
Checking out commit for Stable Diffusion XL with hash: 45c443b316737a4ab6e40413d7794a7f5657c19f...
error: The following untracked working tree files would be overwritten by checkout:
    .github/workflows/black.yml
    .github/workflows/test-build.yaml
    .github/workflows/test-inference.yml
    CODEOWNERS
    LICENSE-CODE
    assets/001_with_eval.png
    model_licenses/LICENSE-SDXL0.9
    model_licenses/LICENSE-SDXL1.0
    pyproject.toml
    pytest.ini
    requirements/pt13.txt
    requirements/pt2.txt
    scripts/tests/attention.py
    sgm/inference/api.py
    sgm/inference/helpers.py
    sgm/modules/autoencoding/lpips/__init__.py
    sgm/modules/autoencoding/lpips/loss/.gitignore
    sgm/modules/autoencoding/lpips/loss/LICENSE
    sgm/modules/autoencoding/lpips/loss/__init__.py
    sgm/modules/autoencoding/lpips/loss/lpips.py
    sgm/modules/autoencoding/lpips/model/LICENSE
    sgm/modules/autoencoding/lpips/model/__init__.py
    sgm/modules/autoencoding/lpips/model/model.py
    sgm/modules/autoencoding/lpips/util.py
    sgm/modules/autoencoding/lpips/vqperceptual.py
    tests/inference/test_inference.py
Please move or remove them before you switch branches.

Additional information

No response

rabbitflyer commented 9 months ago

Do you have any of your own tweaks or edits to the webui that you don't want to lose? If you don't, then open a terminal at the webui root directory (stable-diffusion-webui by default), and enter git reset --hard. If you're unsure, you could do git stash push instead.

genbobo commented 9 months ago

I have some models and Lora，they will lose？

genbobo commented 9 months ago

I updated version 1.6, but due to the system reinstallation and the environment variables changed, I downloaded an integration pack, then copied to the previous file and overwrote it, but the integration pack is not version 1.6, so I tried to upgrade and I got an error.

rabbitflyer commented 9 months ago

I have some models and Lora，they will lose？

No, I'm pretty sure they'll be alright, although you could move them to another folder if you want to be doubly sure.

genbobo commented 9 months ago

thank you,I already fix it. I follow above codes and delate these python files, then the program runs successfully。These files are all in stable-diffusion-webui\repositories\generative-models。

AUTOMATIC1111 / stable-diffusion-webui