mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-15 12:53:31 +08:00
09ac74e131
Local main was already updated to origin/main at 8f0e46e, and this merge brings those buddy/docs/env changes onto feat/dev-desktop. The only conflict was .github/workflows/build-desktop-dev.yml, where both branches added the workflow; the resolved version keeps the mainline body and retains the libfuse2 Linux dependency needed for AppImage-oriented tooling. Constraint: Merge was already in progress from local main at 8f0e46e Rejected: Abort and re-run merge from scratch | existing index already isolated the single conflict cleanly Confidence: high Scope-risk: moderate Reversibility: clean Directive: Keep libfuse2 in the desktop dev build workflow unless Linux packaging is revalidated without it Tested: git fetch origin main; git diff --check; manual resolution of build-desktop-dev workflow conflict Not-tested: Root TypeScript typecheck because existing generated desktop/src-tauri/target and extracted-natives assets are included and fail independently of this merge