Auto-merging content/providers/01-ai-sdk-providers/15-google-generative-ai.mdx
CONFLICT (content): Merge conflict in content/providers/01-ai-sdk-providers/15-google-generative-ai.mdx
CONFLICT (file location): examples/ai-functions/src/generate-text/google/image-search.ts added in 2565e7067 (feat(google): add support for image search, replace obsolete google_search_retrieval implementation (#12926)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/image-search.ts.
CONFLICT (file location): examples/ai-functions/src/generate-text/google/search-types.ts added in 2565e7067 (feat(google): add support for image search, replace obsolete google_search_retrieval implementation (#12926)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/search-types.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/image-search.ts added in 2565e7067 (feat(google): add support for image search, replace obsolete google_search_retrieval implementation (#12926)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/image-search.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/search-types.ts added in 2565e7067 (feat(google): add support for image search, replace obsolete google_search_retrieval implementation (#12926)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/search-types.ts.
Auto-merging packages/google/src/google-generative-ai-language-model.test.ts
CONFLICT (content): Merge conflict in packages/google/src/google-generative-ai-language-model.test.ts
Auto-merging packages/google/src/google-generative-ai-language-model.ts
Auto-merging packages/google/src/google-prepare-tools.test.ts
Auto-merging packages/google/src/google-prepare-tools.ts
CONFLICT (content): Merge conflict in packages/google/src/google-prepare-tools.ts
Auto-merging packages/google/src/tool/google-search.ts
CONFLICT (content): Merge conflict in packages/google/src/tool/google-search.ts
error: could not apply 2565e7067... feat(google): add support for image search, replace obsolete google_search_retrieval implementation (#12926)
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"