lllyasviel / lllyasviel/stable-diffusion-webui-forge
[Question]: What kind of reconciling should I choose when installing as second branch into A1111?
- Dominant language
- Python
- Stars
- 13k
- Forks
- 1.7k
- PR merge metrics
- No merged PRs in 30d
Description
### Checklist
- [X] The issue exists after disabling all extensions
- [X] The issue exists on a clean installation of webui
- [ ] The issue is caused by an extension, but I believe it is caused by a bug in the webui
- [X] The issue exists in the current version of the webui
- [X] The issue has not been reported before recently
- [ ] The issue has been reported before but has not been fixed yet
### What happened?
I wanted to install SD Forge on old AUTOMATIC1111/stable-diffusion-webui installation following instructions [here](https://github.com/continue-revolution/sd-webui-animatediff/blob/forge/master/docs/how-to-use.md#you-have-a1111-and-you-know-git), as it was mentioned in the README.
But it led to divergent branches and now I need to specify, how to reconcile divergent branches.
This happened also on fresh cloned repos.
Does this way still work? What kind of reconciling should I choose then?
### Steps to reproduce the problem
```Shell
git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui.git sd-test-folder
cd sd-test-folder
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?
I should be able to simply pull and checkout different branches
### What browsers do you use to access the UI ?
Other
### Sysinfo
irrelevant
### Console logs
```Shell
Cloning into 'sd-test-folder'...
remote: Enumerating objects: 32673, done.
remote: Counting objects: 100% (83/83), done.
remote: Compressing objects: 100% (57/57), done.
remote: Total 32673 (delta 30), reused 58 (delta 23), pack-reused 32590
Receiving objects: 100% (32673/32673), 34.43 MiB | 20.56 MiB/s, done.
Resolving deltas: 100% (22857/22857), done.
Switched to branch 'lllyasviel/main'
remote: Enumerating objects: 6620, done.
remote: Counting objects: 100% (1999/1999), done.
remote: Compressing objects: 100% (609/609), done.
remote: Total 6620 (delta 1477), reused 1748 (delta 1347), pack-reused 4621
Receiving objects: 100% (6620/6620), 11.32 MiB | 12.24 MiB/s, done.
Resolving deltas: 100% (3590/3590), completed with 77 local objects.
From https://github.com/lllyasviel/stable-diffusion-webui-forge
* [new branch] conrevo/fix-device -> forge/conrevo/fix-device
* [new branch] conrevo/gn-patcher-for-early-ad -> forge/conrevo/gn-patcher-for-early-ad
* [new branch] depth_fm -> forge/depth_fm
* [new branch] dev -> forge/dev
* [new branch] main -> forge/main
* [new tag] latest -> latest
* [new tag] v1.7.0d -> v1.7.0d
branch 'lllyasviel/main' set up to track 'forge/main'.
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
```
### Additional information
_No response_
Contributor guide
No contributing guide indexed for this repository
Research direction
Start with the README's linked docs/how-to-use.md section and reproduce the listed Git commands in a fresh clone. Determine whether the documented branch setup still works, then update the installation guidance or examples so the supported procedure and expected result are clear.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, python
- Domain
- tooling
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 25/100