[dnceng-bot] Branch `installer/release/8.0.1xx` can't be merged to Azdo internal branch
- Dominant language
- No language data
- Stars
- 1.3k
- Forks
- 437
- Avg merge
- 3d 14h
- Merged PRs (30d)
- 21
Description
Branch [release/8.0.1xx](https://github.com/dotnet/installer/commits/release/8.0.1xx/) in `dotnet/installer` repo can't be mirrored from GitHub to Azure [internal/release/8.0.1xx](https://dev.azure.com/dnceng/internal/_git/dotnet-installer?version=GBinternal%2Frelease%2F8.0.1xx&_a=history) via internal merge.
There are conflicting commits in the target branch.
The branch is configured to be mirrored via automated merge.
The situation is rare but normal. The target branch is expected to receive manual commits in the Azure DevOps clone, which could cause conflict.
Conflicts need to be **resolved to unblock the code flow**.
- you can resolve the issue by resolving the conflict in the **target branch only**.
- Please make sure that the changes sensitive from security perspective are not published ahead of time to GitHub!
- 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 conflict is resolved.
Contributor guide
No contributing guide indexed for this repository
Research direction
Start by checking the mirroring pipeline and its logs for the release/8.0.1xx conflict, then read the dotnet-mirroring README.md and dnceng-subscriptions.jsonc configuration. Resolve the conflict only in the Azure DevOps target branch, or revert the extra commits, while checking that sensitive changes are not published to GitHub. Done means mirroring resumes and the issue can be closed.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- azure, git, github, json
- Domain
- ci-cd, devops, release
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Active
- Clarity
- Mostly clear
- Newbie friendliness
- 48/100