test: update conformance snapshots for merge conflict diagnostics#15462
Merged
sapphi-red merged 2 commits intoc/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflictsfrom Nov 8, 2025
Conversation
Co-authored-by: sapphi-red <49056869+sapphi-red@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Improve diagnostic messages for merge conflicts in parser
test: update conformance snapshots for merge conflict diagnostics
Nov 8, 2025
sapphi-red
merged commit da6cf0f
into
c/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflicts
22 of 36 checks passed
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.
Updates test snapshots to reflect the improved merge conflict diagnostic messages implemented in previous commits.
Changes
parser_misc.snapandparser_typescript.snapwith capitalized error titles and properly formatted help textThe snapshots were updated by running
just conformanceafter the diagnostic message improvements were merged.💡 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.