Resolve merge conflict on docs/daily-scan-2026-07-22 (5th conflict) - #439
Open
claude[bot] wants to merge 20 commits into
Open
Resolve merge conflict on docs/daily-scan-2026-07-22 (5th conflict)#439claude[bot] wants to merge 20 commits into
claude[bot] wants to merge 20 commits into
Conversation
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
…07-22 # Conflicts: # docs/en-US/platform/openapi/overview.mdx
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: taylor-fang <taylor-fang@users.noreply.github.com>
# Conflicts: # docs/en-US/platform/index.mdx
…nces (#444) Co-authored-by: Taylor Fang <taylorfang@Mac.attlocal.net>
…ling behavior (#445) Co-authored-by: moss-bryophyta <261561981+moss-bryophyta@users.noreply.github.com>
# Conflicts: # docs/en-US/platform/openapi/overview.mdx
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
# Conflicts: # docs/en-US/platform/dashboard/guides/adding-translation-context.mdx
Co-authored-by: Taylor Fang <taylorfang@Mac.attlocal.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges main into the PR #405 branch to resolve a merge conflict in platform/openapi/overview.mdx (combined this PR's grammar fix with upstream's added detail about Organization-scoped endpoints). Routed through a PR since direct pushes to this branch are now blocked by a repository rule.
Generated by Claude Code