dotnet / dotnet/sdk

[dnceng-bot] Branch `sdk/release/8.0.4xx` can't be merged to Azdo internal branch

Open
#56,098 0 comments 0 reactions 0 assignees View on GitHub
untriaged
Dominant language
C#
Stars
3.2k
Forks
1.3k
PR merge metrics
PR metrics pending

Description

Branch [release/8.0.4xx](https://github.com/dotnet/sdk/commits/release/8.0.4xx/) in `dotnet/sdk` repo can't be mirrored from GitHub to Azure [internal/release/8.0.4xx](https://dev.azure.com/dnceng/internal/_git/dotnet-sdk?version=GBinternal%2Frelease%2F8.0.4xx&_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 reviewing the mirroring pipeline logs and the dotnet-mirroring README, then inspect the conflicting commits in Azure DevOps branch internal/release/8.0.4xx. Resolve the conflict in the target branch only, or revert the extra target-branch commits, while ensuring sensitive changes are not published to GitHub. Confirm that automated mirroring resumes, and close the issue once the code flow is unblocked.

Written by the indexing model from the issue text.

Assessment

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

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.