Auto-merging content/providers/01-ai-sdk-providers/00-ai-gateway.mdx
CONFLICT (file location): examples/ai-functions/src/stream-text/gateway-provider-options-quota-entity-id.ts added in 3aca8474e (Backport: feat (provider/gateway): add quota entity id to gateway provider options (#14164)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/gateway-provider-options-quota-entity-id.ts.
CONFLICT (directory rename split): Unclear where to rename examples/ai-functions/src/stream-text/nim to; it was renamed to multiple other directories, with no destination getting a majority of the files.
Auto-merging packages/gateway/src/gateway-language-model.test.ts
Auto-merging packages/gateway/src/gateway-provider-options.ts
error: could not apply 3aca8474e... Backport: feat (provider/gateway): add quota entity id to gateway provider options (#14164)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"