-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Closed
Closed
Copy link
Labels
area-infrastructureIncludes: MSBuild projects/targets, build scripts, CI, Installers and shared frameworkIncludes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Description
Branch release/8.0 in dotnet/aspnetcore
repo can't be mirrored from GitHub to Azure internal/release/8.0 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.
- 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 conflict is resolved.
Metadata
Metadata
Assignees
Labels
area-infrastructureIncludes: MSBuild projects/targets, build scripts, CI, Installers and shared frameworkIncludes: MSBuild projects/targets, build scripts, CI, Installers and shared framework