Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dnceng-bot] Branch sdk/release/9.0.1xx-rc2 can't be mirrored to Azdo fast forward branch #43563

Closed
dotnet-maestro-bot opened this issue Sep 18, 2024 · 1 comment
Labels
Area-Infrastructure untriaged Request triage from a team member

Comments

@dotnet-maestro-bot
Copy link
Contributor

Branch release/9.0.1xx-rc2 in dotnet/sdk repo can't be mirrored from GitHub to Azure DevOps release/9.0.1xx-rc2 via fast forward.
There are unexpected commits in the target branch.
The branch is configured to be mirrored via fast forward only and is not expected to receive commits in the Azure DevOps clone.

Problem need to be resolved to unblock the code flow.

You can resolve the issue by unifying the SHA of the branches:

  • merging the extra commits from the Azdo target branch into the source branch and pushing the changes to GitHub.
    • Please make sure that the changes are not sensitive from security perspective!
  • reverting the extra commits in the Azdo target branch.
  • checking the logs of the mirroring process in the mirroring pipeline.
  • you can disable the mirroring of the branch in the configuration file.
  • you can ask @dotnet/dnceng for help or read the documentation.

Please close this issue once the problem is resolved.

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Sep 18, 2024
@marcpopMSFT
Copy link
Member

My previous attempt to fix this used a cherry-pick which creates a new commit. This PR uses the exact commit. #43580

@mmitche mmitche closed this as completed Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

No branches or pull requests

3 participants