Merge upstream/main to resolve PR #35 conflicts#4
Closed
Copilot wants to merge 2 commits intoupdate-readmefrom
Closed
Merge upstream/main to resolve PR #35 conflicts#4Copilot wants to merge 2 commits intoupdate-readmefrom
Copilot wants to merge 2 commits intoupdate-readmefrom
Conversation
Co-authored-by: seesharprun <5067401+seesharprun@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Resolve merge conflict for PR #35
Merge upstream/main to resolve PR #35 conflicts
Dec 30, 2025
seesharprun
added a commit
that referenced
this pull request
Dec 30, 2025
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
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.
PR documentdb#35 (update-readme) cannot merge into
documentdb/docs:maindue to conflicts. The branch was created from PR #4 but is missing PRs documentdb#5-documentdb#34 (~45K lines, 228 files of API reference docs) that were subsequently merged to main.Changes
documentdb/docs:mainintoupdate-readmebranch lineageResult
When this branch merges into
update-readme, PR documentdb#35 will merge cleanly intodocumentdb/docs:mainwith both:Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.