Skip to content

[TEST] New page with nav link, no base conflict (auto-fixable)#38321

Closed
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-20-1231-conflict-1cb2b2c0from
jen.gilbert/astro-reorg-test-new-page-nav-autofixable-0dee841d
Closed

[TEST] New page with nav link, no base conflict (auto-fixable)#38321
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-20-1231-conflict-1cb2b2c0from
jen.gilbert/astro-reorg-test-new-page-nav-autofixable-0dee841d

Conversation

@jhgilbert

Copy link
Copy Markdown
Contributor

Test PR for exercising the astro reorg tooling. Adds a new page and a nav menu entry linking to it. The base branch does not touch that menu line, so the auto-fix should replay both changes cleanly.

Do not merge.

@jhgilbert jhgilbert added the Do Not Merge Just do not merge this PR :) label Jul 20, 2026
@jhgilbert
jhgilbert requested a review from a team as a code owner July 20, 2026 17:39
@jhgilbert jhgilbert added astro-reorg-testing Test PRs for exercising the astro reorg tooling Do Not Merge Just do not merge this PR :) labels Jul 20, 2026
@jhgilbert

Copy link
Copy Markdown
Contributor Author

🤖 Reorg conflict auto-fix:

This PR has merge conflicts caused by the recent docs repo reorg (files moved from the repo root into hugo/). A new PR with your commits translated to the correct paths has been opened: #38323

Please follow the instructions in the PR description.

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 jhgilbert closed this Jul 20, 2026
@jhgilbert jhgilbert added astro-reorg-autofixed Needs manual conflict resolution after replatforming reorg astro-reorg-processed Needs manual conflict resolution after replatforming reorg labels Jul 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

astro-reorg-autofixed Needs manual conflict resolution after replatforming reorg astro-reorg-processed Needs manual conflict resolution after replatforming reorg astro-reorg-testing Test PRs for exercising the astro reorg tooling Do Not Merge Just do not merge this PR :)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant