[dnceng-bot] Branch `eShop/main` can't be mirrored to Azdo fast forward branch
- Dominant language
- C#
- Stars
- 10.9k
- Forks
- 3.8k
- Avg merge
- 1d 11h
- Merged PRs (30d)
- 4
Description
Branch [main](https://github.com/dotnet/eShop/commits/main/) in `dotnet/eShop` repo can't be mirrored from GitHub to Azure DevOps [main](https://dev.azure.com/dnceng/internal/_git/dotnet-eShop?version=GBmain&_a=history) 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](https://dev.azure.com/dnceng/internal/_build?definitionId=1387).
- you can disable the mirroring of the branch in the [configuration file](https://dev.azure.com/dnceng/internal/_git/dotnet-mirroring?path=/dnceng-subscriptions.jsonc).
- you can ask @dotnet/dnceng for help or read the [documentation](https://dev.azure.com/dnceng/internal/_git/dotnet-mirroring?path=/README.md).
Please close this issue once the problem is resolved.
Contributor guide
Research direction
Start with the mirroring pipeline (definition 1387), the dnceng-subscriptions.jsonc configuration, and the dotnet-mirroring README. Compare the GitHub and Azure DevOps main branch SHAs and inspect the mirroring logs; done means the branches are unified or mirroring is intentionally disabled, the code flow is unblocked, and the issue can be closed.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- azure, git, github
- Domain
- ci-cd, devops, infrastructure
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Active
- Clarity
- Mostly clear
- Newbie friendliness
- 38/100