in this case a lot of the large change is actually "upstream". We Have Neon, who is making a PR. We have Upstream, SD source. We have basu, repo maintainer.

in this case a lot of the large change is actually "upstream". We Have Neon, who is making a PR. We have Upstream, SD source. We have basu, repo maintainer. Neon pulled in upstream changes, and are trying to merge those into basu's repo AND then on top of that, apply neon edits to the code. Ways to make this cleaner: - Basu pulls in upstream changes, Neon just puts theirs on top. (Slow, you have to wait for Basu) - Neon makes two PRs, one to pull in upstream changes, another for his edits on top of those changes. (More work, and coordination, but each PR is "one unit of work") - Better commit messages: https://github.com/basujindal/stable-diffusion/pull/103#commits-pushed-47f8784 https://github.com/basujindal/stable-diffusion/pull/103#comm... <- notice the repeated and non-descript commit messages? That makes it hard for non-experts to cherry pick out the bits that are really relevant. (Fastest)