[TEST] Non-reorg conflict on a top-level file (not auto-fixable)#38267
Open
jhgilbert wants to merge 1 commit into
Open
Conversation
Contributor
|
Contributor
Author
|
This PR has merge conflicts from a recent repo reorg that could not be resolved automatically. If you feel comfortable resolving the conflicts yourself:
If you prefer that we resolve your conflicts, add the label This is an automated comment, but if you have a question, you can mention me in this PR (external contributors) or reach out in #docs-repo-reorg-support on Slack (internal contributors). |
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.
Test PR for exercising the astro reorg tooling. Creates a conflict on a top-level file that the reorg doesn't move, so it isn't a reorg conflict and should go straight to manual review.
Do not merge.