Skip to content

Backport: chore: add readme for @ai-sdk/mcp#15450

Merged
aayush-kapoor merged 3 commits into
release-v6.0from
backport-pr-15445-to-release-v6.0
May 19, 2026
Merged

Backport: chore: add readme for @ai-sdk/mcp#15450
aayush-kapoor merged 3 commits into
release-v6.0from
backport-pr-15445-to-release-v6.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

This is an automated backport of #15445 to the release-v6.0 branch. FYI @aayush-kapoor
This backport has conflicts that need to be resolved manually.

git cherry-pick output

CONFLICT (modify/delete): .github/konsistent.json deleted in HEAD and modified in 5ca54e753 (chore: add readme for @ai-sdk/mcp (#15445)).  Version 5ca54e753 (chore: add readme for @ai-sdk/mcp (#15445)) of .github/konsistent.json left in tree.
error: could not apply 5ca54e753... chore: add readme for @ai-sdk/mcp (#15445)
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"

@aayush-kapoor aayush-kapoor marked this pull request as ready for review May 19, 2026 21:45
@aayush-kapoor aayush-kapoor enabled auto-merge (squash) May 19, 2026 21:46
@aayush-kapoor aayush-kapoor merged commit 5e287d0 into release-v6.0 May 19, 2026
17 checks passed
@aayush-kapoor aayush-kapoor deleted the backport-pr-15445-to-release-v6.0 branch May 19, 2026 21:53
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.

1 participant