Fix merge conflict in NextVersion.md for reality data reprojection backport [release/5.7.x]#9078
Closed
Copilot wants to merge 2 commits into
Closed
Fix merge conflict in NextVersion.md for reality data reprojection backport [release/5.7.x]#9078Copilot wants to merge 2 commits into
Copilot wants to merge 2 commits into
Conversation
Co-authored-by: hl662 <50554904+hl662@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix reality data reprojection with different CRS
Fix merge conflict in NextVersion.md for reality data reprojection backport [release/5.7.x]
Mar 10, 2026
Contributor
|
Bad copilot |
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.
Security Fix
Severity
Description
Resolves a merge conflict in
docs/changehistory/NextVersion.mdblocking the backport of PR #9059 (reality data reprojection CRS fix) torelease/5.7.x.Root Cause
The cherry-pick from master included the full master
NextVersion.mdcontent — which contained an unrelatedWithQueryReader APIsection — against an emptyNextVersion.mdonrelease/5.7.x, producing a conflict.Link to Security Notice
N/A
Solution
Resolved the conflict by retaining only the
Display > Fixesentry relevant to this backport, discarding theWithQueryReader APIsection that belongs exclusively to master.Additional Notes
No code logic changes — documentation conflict resolution only.
💡 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.