• Mrau Hu's avatar
    Fix: `error: Your local changes to the following files would be overwritten by... · d671d1d4
    Mrau Hu authored
    Fix: `error: Your local changes to the following files would be overwritten by merge` when run `pull()` method,
    because WSL2 Docker set 755 file permissions instead of 644, this results to the error.
    
    Updated `Extension` class: replaced `pull()` with `fetch_and_reset_hard()` method.
    
    Updated `apply_and_restart()` function: replaced `ext.pull()` with `ext.fetch_and_reset_hard()` function.
    d671d1d4
Name
Last commit
Last update
.github Loading commit data...
embeddings Loading commit data...
extensions Loading commit data...
javascript Loading commit data...
localizations Loading commit data...
models Loading commit data...
modules Loading commit data...
scripts Loading commit data...
test Loading commit data...
textual_inversion_templates Loading commit data...
.gitignore Loading commit data...
.pylintrc Loading commit data...
CODEOWNERS Loading commit data...
README.md Loading commit data...
artists.csv Loading commit data...
environment-wsl2.yaml Loading commit data...
launch.py Loading commit data...
requirements.txt Loading commit data...
requirements_versions.txt Loading commit data...
screenshot.png Loading commit data...
script.js Loading commit data...
style.css Loading commit data...
txt2img_Screenshot.png Loading commit data...
webui-user.bat Loading commit data...
webui-user.sh Loading commit data...
webui.bat Loading commit data...
webui.py Loading commit data...
webui.sh Loading commit data...