30f667c9de
Three conflicts, all where main rewrote code this branch had also touched: - .github/workflows/studio-backend-ci.yml path filter: kept both sides, so docker/** still triggers Backend CI and main's install.sh, install.ps1 and scripts/** triggers come along too. - The same workflow's shell-test step and tests/run_all.sh: took main's directory discovery over this branch's hand-written file lists, which had drifted. tests/studio/test_ci_shell_suite_coverage.py passes. - studio/install_llama_prebuilt.py: took main's delegation of _os_error_messages and is_busy_lock_error to prebuilt_core and kept this branch's is_cross_device_error, which the EXDEV copy-and-remove fallback still calls. BusyInstallConflict is already the prebuilt_core class here, so the delegated isinstance check is unchanged. |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| scripts | ||
| workflows | ||
| CODEOWNERS | ||
| dependabot.yml | ||
| FUNDING.yml | ||