Skip to content

[TEST] Unresolvable reorg conflict (base edited the same line) (not auto-fixable)#38266

Open
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-unresolvable-reorg-3fdce8fc
Open

[TEST] Unresolvable reorg conflict (base edited the same line) (not auto-fixable)#38266
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-unresolvable-reorg-3fdce8fc

Conversation

@jhgilbert

Copy link
Copy Markdown
Contributor

Test PR for exercising the astro reorg tooling. Edits a line that the reorged base branch also changed, so the auto-fix can't replay it and the PR should be labeled for manual review.

Do not merge.

@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-prod-us1-4

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

@jhgilbert jhgilbert added astro-reorg-manual-review Needs manual conflict resolution after replatforming reorg WORK IN PROGRESS No review needed, it's a wip ;) labels Jul 17, 2026
@jhgilbert

Copy link
Copy Markdown
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:

  1. Resolve the conflicts. For a full list of repo files and folders and their updated location, see the configuration file for the reorg script.
  2. When your PR is ready for merge, remove the WORK IN PROGRESS label.
  3. Wait for the standard docs team approval before merging. Optionally, you can check the 'ready for merge' checkbox in the PR description if you would like the docs team to merge it for you.

If you prefer that we resolve your conflicts, add the label astro-reorg-help-requested to your PR. This will add it to our support queue, and we will reach out to you as soon as possible.

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

Labels

astro-reorg-manual-review 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 :) 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