stable-diffusion-webui
stable-diffusion-webui copied to clipboard
[Bug]: GIT PULL gives some error, not sure if it updates or not.
Is there an existing issue for this?
- [X] I have searched the existing issues and checked the recent builds/commits
What happened?
remote: Enumerating objects: 94, done. remote: Counting objects: 100% (84/84), done. remote: Compressing objects: 100% (53/53), done. remote: Total 94 (delta 45), reused 48 (delta 31), pack-reused 10 Unpacking objects: 100% (94/94), 116.06 KiB | 287.00 KiB/s, done. From https://github.com/AUTOMATIC1111/stable-diffusion-webui b08698a..ac08562 master -> origin/master ec37f8a..5aaaf44 features-to-readme -> origin/features-to-readme error: Your local changes to the following files would be overwritten by merge: requirements.txt requirements_versions.txt Please commit your changes or stash them before you merge. Aborting Updating 737eb28..ac08562
Steps to reproduce the problem
- Go to ....
- Press ....
- ... right after git pull
What should have happened?
normal update without error messages..... not sure if it actually updates even with error message,,
Commit where the problem happens
737eb28faca8be2bb996ee0930ec77d1f7ebd939
What platforms do you use to access UI ?
Windows
What browsers do you use to access the UI ?
Google Chrome
Command Line Arguments
No response
Additional information, context and logs
No response
backup requirements.txt and requirements_versions.txt if you need to then delete them before you update with git pull. The update will replace them. You can copy them back over after if you need to.
git stash
will store your changes in those files in "stash"
after that you can do regular git pull
and later you can run git stash apply
to bring back your modified files.
git stash
will store your changes in those files in "stash" after that you can do regulargit pull
and later you can rungit stash apply
to bring back your modified files.
ok i deleted it and git pull, done.... i have to add MOVIE PIE to the req files......