Skip to content

[TEST] WIP PR with reorg conflict (should be skipped by resolver)#38265

Closed
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-wip-f7ab7c54
Closed

[TEST] WIP PR with reorg conflict (should be skipped by resolver)#38265
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-wip-f7ab7c54

Conversation

@jhgilbert

Copy link
Copy Markdown
Contributor

Test PR for exercising the astro reorg tooling. Auto-fixable reorg conflict, but marked WIP so the resolver should leave a comment and skip it.

Do not merge.

@jhgilbert jhgilbert added WORK IN PROGRESS No review needed, it's a wip ;) 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:49
@jhgilbert jhgilbert added WORK IN PROGRESS No review needed, it's a wip ;) 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-us1-prod

Copy link
Copy Markdown

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: f17ac05 | Docs | Datadog PR Page | Give us feedback!

@jhgilbert

Copy link
Copy Markdown
Contributor Author

This PR has merge conflicts created by the docs repo reorg project. Because this PR is marked as a work in progress, no attempt was made to auto-resolve the conflicts. When your PR is ready, remove the WORK IN PROGRESS label and the astro-reorg-skip label. Your PR will be processed in the next batch of attempted auto-fixes.

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

Labels

astro-reorg-processed Needs manual conflict resolution after replatforming reorg astro-reorg-skip 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 :) WORK IN PROGRESS No review needed, it's a wip ;)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant