Wrong installation How-To - Githubissues

continue-revolution / sd-webui-animatediff

AnimateDiff for AUTOMATIC1111 Stable Diffusion WebUI

Other

3.05k stars 253 forks source link

Wrong installation How-To #549

Open misterHallodri opened 1 month ago

misterHallodri commented 1 month ago

Is there an existing issue for this?

[X] I have searched the existing issues and checked the recent builds/commits of both this extension and the webui

Have you read FAQ on README?

[X] I have updated WebUI and this extension to the latest version

What happened?

Not a bug but something is not working here when I follow the installation "how-to" described here : https://github.com/continue-revolution/sd-webui-animatediff/blob/forge/master/docs/how-to-use.md#you-have-a1111-and-you-know-git

I am following the steps, but even with a fresh A1111 repository I get merge conflicts when I pull from "forge/main" into my branch.

Steps to reproduce the problem

git remote add forge https://github.com/lllyasviel/stable-diffusion-webui-forge git branch lllyasviel/main git checkout lllyasviel/main git fetch forge git branch -u forge/main git pull

What should have happened?

no merge conflicts

Commit where the problem happens

merge conflicts

What browsers do you use to access the UI ?

No response

Command Line Arguments

No

Console logs

merge conflicts

Additional information

No response

Ken-g6 commented 1 month ago

I've been trying to checkout from the last merged commit, 82a973c04367123ae98bd9abdf80d9eda9b910e2, before running git pull. I can't figure out why that's not fixing this. Anyway, running git pull with -Xignore-space-at-eol seems to help slightly reduce the conflicts.