Auto-merging packages/anthropic/src/anthropic-messages-api.ts
Auto-merging packages/anthropic/src/anthropic-messages-language-model.test.ts
Auto-merging packages/anthropic/src/anthropic-messages-language-model.ts
Auto-merging packages/anthropic/src/anthropic-prepare-tools.ts
Auto-merging packages/anthropic/src/convert-to-anthropic-messages-prompt.test.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/convert-to-anthropic-messages-prompt.test.ts
Auto-merging packages/anthropic/src/convert-to-anthropic-messages-prompt.ts
error: could not apply 6f845b473... feat(provider/anthropic): add code_execution_20250825 tool (#9435)
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"