Skip to content

Conversation

@vercel-ai-sdk
Copy link
Contributor

@vercel-ai-sdk vercel-ai-sdk bot commented Oct 23, 2025

This is an automated backport of #9720 to the release-v5.0 branch.
This backport has conflicts that need to be resolved manually.

git cherry-pick output

Auto-merging packages/ai/src/ui/convert-to-model-messages.test.ts
CONFLICT (content): Merge conflict in packages/ai/src/ui/convert-to-model-messages.test.ts
Auto-merging packages/ai/src/ui/convert-to-model-messages.ts
CONFLICT (content): Merge conflict in packages/ai/src/ui/convert-to-model-messages.ts
Auto-merging packages/ai/src/ui/index.ts
Auto-merging packages/ai/src/ui/ui-messages.ts
CONFLICT (content): Merge conflict in packages/ai/src/ui/ui-messages.ts
error: could not apply 9b8394786... feat(ai): add convertDataPart option to convertToModelMessages (#9720)
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"

@lgrammel lgrammel marked this pull request as ready for review October 23, 2025 13:00
…sages.mdx

Co-authored-by: vercel[bot] <35613825+vercel[bot]@users.noreply.github.com>
@lgrammel lgrammel merged commit 3568ebc into release-v5.0 Oct 23, 2025
18 checks passed
@lgrammel lgrammel deleted the backport-pr-9720-to-release-v5.0 branch October 23, 2025 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants