[dnceng-bot] Branch `eShop/main` can't be mirrored to Azdo fast forward branch

Open
#1,013 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
4/5
Estimated time
3-5 days
Newbie friendliness
38/100
Issue type
Bug
Clarity
Mostly clear
Activity status
Active
Tech stack
azure, git, github
Domain
ci-cd, devops, infrastructure

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.

Description

Branch main in dotnet/eShop repo can't be mirrored from GitHub to Azure DevOps main 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.

Dominant language
C#
Stars
10.9k
Forks
3.8k
Avg merge
1d 11h
Merged PRs (30d)
4

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from dotnet/eShop

All issues in dotnet/eShop

Similar issues

More C# issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.