Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[dnceng-bot] Branch winforms/release/8.0 can't be merged to Azdo internal branch #13278

Copy link
Copy link
Closed
@dotnet-maestro-bot

Description

@dotnet-maestro-bot
Issue body actions

Branch release/8.0 in dotnet/winforms 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

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions

    Morty Proxy This is a proxified and sanitized view of the page, visit original site.