mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
- Resolve merge conflict in codex-rs/Cargo.lock by adopting upstream version (outside prefer-ours globs). - Add RUSTUP_HOME export in scripts/upstream-merge/verify.sh to avoid CI HOME permission issues during cargo check. - Verified via scripts/upstream-merge/verify.sh: build-fast OK, API check OK, static guards OK, branding clean.