[TEST] Mixed reorg + non-reorg conflicts (manual review expected) - #38801
Closed
jhgilbert wants to merge 1 commit into
Closed
Conversation
jhgilbert
added
Do Not Merge
Contributor
Author
|
[Automated message] This PR has been scanned for conflicts caused by the recent repo reorg. No reorg-related conflicts were found, so no action was taken to auto-fix the conflicts. If you believe this is incorrect, add the 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). |
jhgilbert
added
the
astro-reorg-processed
jhgilbert
deleted the
jen.gilbert/astro-reorg-test-mixed-conflicts-85ee4b79
branch
August 5, 2026 22:45
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
1 participant
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. Adds a new page at a pre-reorg path (wrong-path addition → reorg conflict) and edits a line in CONTRIBUTING.md that the base also changed (non-reorg conflict). The resolver should label this PR for manual review without attempting an auto-fix.
Do not merge.