Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

error: Your local changes to the following files would be overwritten by merge: #3700

Closed
jyju972 opened this issue Jun 12, 2024 · 2 comments
Closed

Comments

@jyju972
Copy link

jyju972 commented Jun 12, 2024

Capture d’écran 2024-06-12 164205
Capture d’écran 2024-06-12 165401

@Svring
Copy link

Svring commented Jun 13, 2024

try this snippet, you could insert a new code cell to execute it after you've mounted your google drive.
!cd /content/drive/MyDrive/ComfyUI #change this to your own folder path
!git restore .ci/update_windows/update.py
!git restore .ci/update_windows/update_comfyui.bat
!git restore .ci/update_windows/update_comfyui_and_python_dependencies.bat
!git restore .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat
!git pull

@ltdrdata
Copy link
Contributor

ltdrdata commented Jun 13, 2024

The reason is that Google Drive removes the execution permissions of files, which causes them to be considered as modified. You need to manually reset the permissions to their original settings.

@jyju972 jyju972 closed this as completed Jun 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants