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 msbuild/vs17.12 can't be mirrored to Azdo fast forward branch #10679

Closed
dotnet-maestro-bot opened this issue Sep 19, 2024 · 1 comment
Assignees

Comments

@dotnet-maestro-bot
Copy link
Contributor

Branch vs17.12 in DotNet/msbuild repo can't be mirrored from GitHub to Azure DevOps vs17.12 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.

@rainersigwald rainersigwald self-assigned this Sep 19, 2024
@rainersigwald
Copy link
Member

git push devdiv-trusted upstream/vs17.12:vs17.12 --force-with-lease
Enumerating objects: 11, done.
Counting objects: 100% (11/11), done.
Delta compression using up to 32 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 1.45 KiB | 1.45 MiB/s, done.
Total 6 (delta 5), reused 1 (delta 0), pack-reused 0 (from 0)
remote: Analyzing objects... (6/6) (19 ms)
remote: Validating commits... (1/1) done (0 ms)
remote: Checking for credentials and other secrets...  done (38 ms)
remote: Storing packfile... done (43 ms)
remote: Storing index... done (52 ms)
To https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/DotNet-msbuild-Trusted
 + 37ba950c44...fea15fbd1f upstream/vs17.12 -> vs17.12 (forced update)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants