Merge mscodehub/main to restore mirror ancestry (fixes #116)#117
Closed
jshigetomi wants to merge 9 commits intoPowerShell:mainfrom
Closed
Merge mscodehub/main to restore mirror ancestry (fixes #116)#117jshigetomi wants to merge 9 commits intoPowerShell:mainfrom
jshigetomi wants to merge 9 commits intoPowerShell:mainfrom
Conversation
Blank commit to fix OneBranch through PR validation
…ll module versions (PowerShell#112) Use `RequiredResource` hashtable to specify PowerShell module versions (PowerShell#112)
Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 8.0.300 to 8.0.318. - [Release notes](https://github.com/dotnet/sdk/releases) - [Commits](dotnet/sdk@v8.0.300...v8.0.318)
…8-68676 into main
The previous PR that brought mscodehub-only commits into upstream/main was squash-merged (commit 8f47b9c), which discarded the parent pointer to mscodehub/main. As a result the AzDO -> GitHub fast-forward mirror still sees the branches as divergent and refuses to push, blocking the code-flow pipeline. This is a no-op merge (-s ours): it keeps upstream/main's tree exactly as-is and only records mscodehub/main (87175cb) as a second parent so that mscodehub/main becomes an ancestor of upstream/main again. After this is merged with the "Create a merge commit" option (NOT squash and NOT rebase), the mirror can fast-forward cleanly. Resolves PowerShell#116 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Problem
The previous PR (#115) that brought mscodehub-only commits into
upstream/mainwas squash-merged (resulting in commit8f47b9c), which discarded the parent pointer tomscodehub/main. As a result the AzDO → GitHub fast-forward mirror still sees the branches as divergent and refuses to push, blocking the code-flow pipeline.This is tracked in #116.
Fix
This is a no-op merge using the
-s oursstrategy:upstream/main's tree exactly as-is — no file changes (verified withgit diff upstream/main HEAD→ empty).mscodehub/main(87175cb) as a second parent so it becomes an ancestor ofupstream/mainagain.After this is merged,
mscodehub/mainwill be reachable from the newmaintip, and the fast-forward mirror can push cleanly.This PR must be merged with "Create a merge commit". Do not squash and do not rebase — either of those will discard the parent pointer to
mscodehub/mainand we will be right back where we started.Resolves #116