dotnet / arcade

Tools that provide common build infrastructure for multiple .NET Foundation projects.
MIT License
657 stars 331 forks source link

[dnceng-bot] Branch `release/8.0` can't be merged to Azure DevOps internal branch #14884

Closed pavelsavara closed 1 week ago

pavelsavara commented 1 week ago

Branch release/8.0 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.

pavelsavara commented 1 week ago

this was just testing

mmitche commented 1 week ago

@pavelsavara The repo name should be included in the issue if it's being file to arcade.

riarenas commented 1 week ago

Pavel is way ahead of you! https://github.com/dotnet/arcade/issues/14885