Uh oh!
There was an error while loading. Please reload this page.
Reconcile release/v10.4 with main - #651
Merged
dennisdoomen merged 1 commit intoAug 23, 2026
Merged
Conversation
dennisdoomen
marked this pull request as ready for review
August 22, 2026 18:09
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 freeto 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.
No file changes — this records that
release/v10.4andmainare reconciled as of this PR, and there is nothing to forward-port.Checked every commit unique to
release/v10.4(40, vs.main) by diffing the two branches and attempting a real merge:mainunder different hashes — separate cherry-picks of the same change (e.g. the telemetry-stripping fix, forward-ported the same way #567 did for the release-pipeline fixes).RewriteCsprojsStep,MigrationIntegrationSpecs,ScriptRewriter) are superseded by a larger refactor already onmain(theIMigrationSteppipeline decomposition), which is a strict superset and even carries a regex fix (da197226)release/v10.4lacks.version.jsonand the versioning row indocs/branching-and-release.mddiffer deliberately —release/v10.4pins its own literal release version;maintracks its own-previewladder. These must not be merged.A real
git merge release/v10.4confirms this: after resolving every conflict, the result is byte-identical tomain. No PR with an actual merge commit is possible anyway — this repo's branch protection disables merge commits and only allows rebase-merge, so a merge PR could never land.Filed as a record so the two branches aren't flagged as unreconciled going forward.