Auto-merging content/providers/01-ai-sdk-providers/05-anthropic.mdx
CONFLICT (content): Merge conflict in content/providers/01-ai-sdk-providers/05-anthropic.mdx
CONFLICT (file location): examples/ai-functions/data/anthropic-compaction-data.txt added in c60b39367 (feat(anthropic): add the new compaction feature (#12384)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/data/anthropic-compaction-data.txt.
CONFLICT (file location): examples/ai-functions/src/generate-text/anthropic-compaction-pause.ts added in c60b39367 (feat(anthropic): add the new compaction feature (#12384)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/anthropic-compaction-pause.ts.
CONFLICT (file location): examples/ai-functions/src/generate-text/anthropic-compaction.ts added in c60b39367 (feat(anthropic): add the new compaction feature (#12384)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/anthropic-compaction.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/anthropic-compaction.ts added in c60b39367 (feat(anthropic): add the new compaction feature (#12384)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/anthropic-compaction.ts.
Auto-merging packages/anthropic/src/__snapshots__/anthropic-messages-language-model.test.ts.snap
CONFLICT (content): Merge conflict in packages/anthropic/src/__snapshots__/anthropic-messages-language-model.test.ts.snap
Auto-merging packages/anthropic/src/anthropic-message-metadata.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/anthropic-message-metadata.ts
Auto-merging packages/anthropic/src/anthropic-messages-api.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/anthropic-messages-api.ts
Auto-merging packages/anthropic/src/anthropic-messages-language-model.test.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/anthropic-messages-language-model.test.ts
Auto-merging packages/anthropic/src/anthropic-messages-language-model.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/anthropic-messages-language-model.ts
Auto-merging packages/anthropic/src/anthropic-messages-options.ts
CONFLICT (content): Merge conflict in packages/anthropic/src/anthropic-messages-options.ts
CONFLICT (modify/delete): packages/anthropic/src/convert-anthropic-messages-usage.test.ts deleted in HEAD and modified in c60b39367 (feat(anthropic): add the new compaction feature (#12384)).  Version c60b39367 (feat(anthropic): add the new compaction feature (#12384)) of packages/anthropic/src/convert-anthropic-messages-usage.test.ts left in tree.
CONFLICT (modify/delete): packages/anthropic/src/convert-anthropic-messages-usage.ts deleted in HEAD and modified in c60b39367 (feat(anthropic): add the new compaction feature (#12384)).  Version c60b39367 (feat(anthropic): add the new compaction feature (#12384)) of packages/anthropic/src/convert-anthropic-messages-usage.ts left in tree.
Auto-merging packages/anthropic/src/convert-to-anthropic-messages-prompt.ts
Auto-merging packages/anthropic/src/index.ts
Auto-merging packages/anthropic/src/map-anthropic-stop-reason.ts
error: could not apply c60b39367... feat(anthropic): add the new compaction feature (#12384)
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"