ceos/unsloth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
unsloth/async_task_outputs/async_task_output_0kxcv4.md
Daniel Han c800e89206 Merge remote-tracking branch 'origin/image-generation' into diffusion-image-workflows 
# Conflicts:
#	studio/backend/core/inference/diffusion.py
#	studio/frontend/src/features/images/images-page.tsx
2026-07-02 03:36:50 +00:00

500 B
Raw Blame History

Continue cascading the already-pushed phase16 branch into the top branches, starting with image-workflows #6769 in the unsloth worktree; phase16 is merged but has unresolved conflicts. Next action is to inspect the conflict hunks in the listed files, especially studio/backend/core/inference/diffusion.py, diffusion_families.py, install tests, frontend picker/API/page files, and the truncated remaining paths from git status, then resolve them without re-running the completed merge command.