Automated merge of upstream/main@0776680b into feat/trae-dollar-usage could not complete cleanly (16 commit(s) behind).
Next step: have Claude (smart-sync workflow, or local claude code in this repo) resolve the conflicts and open a PR manually.
Triggered by .github/workflows/auto-sync-upstream.yml
Automated merge of
upstream/main@0776680bintofeat/trae-dollar-usagecould not complete cleanly (16 commit(s) behind).Next step: have Claude (smart-sync workflow, or local
claude codein this repo) resolve the conflicts and open a PR manually.Triggered by
.github/workflows/auto-sync-upstream.yml