drakezhangandCursor 0b71963344 merge: resolve conflicts with updated feat/upload-download base ...

Keep feat/expand-upload-download (drop mode superset) over the base
branch version for all 12 conflicting files. The drop-to-upload branch
already includes all upload/download functionality plus the new --mode
drop mechanism, overlay suppression, OOPIF coordinate handling, and
expanded error reasons.

Co-authored-by: Cursor <cursoragent@cursor.com>

2026-09-02 17:03:35 +08:00

..

extension

merge: resolve conflicts with updated feat/upload-download base

2026-09-02 17:03:35 +08:00