Skip to content

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

Closed
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-new-page-nav-autofixable-99d0ab12
Closed

[TEST] New page with nav link, no base conflict (auto-fixable)#38268
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-new-page-nav-autofixable-99d0ab12

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 Do Not Merge Just do not merge this PR :) astro-reorg-testing Test PRs for exercising the astro reorg tooling labels Jul 17, 2026
@jhgilbert
jhgilbert requested a review from a team as a code owner July 17, 2026 13:50
@jhgilbert jhgilbert added Do Not Merge Just do not merge this PR :) astro-reorg-testing Test PRs for exercising the astro reorg tooling labels Jul 17, 2026
@datadog-datadog-prod-us1

Copy link
Copy Markdown
Contributor

Pipelines

⚠️ Warnings

🚦 1 Pipeline job failed

DataDog/documentation | build_preview   View in Datadog   GitLab

Useful? React with 👍 / 👎

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 2601fbc | Docs | Datadog PR Page | Give us feedback!

@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: #38274

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 17, 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 17, 2026
@jhgilbert
jhgilbert deleted the jen.gilbert/astro-reorg-test-new-page-nav-autofixable-99d0ab12 branch July 23, 2026 15:50
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