Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[dnceng-bot] Branch sdk/release/6.0.4xx can't be merged to Azdo internal branch #43112

Closed
dotnet-maestro-bot opened this issue Aug 30, 2024 · 0 comments
Closed

[dnceng-bot] Branch sdk/release/6.0.4xx can't be merged to Azdo internal branch #43112

dotnet-maestro-bot opened this issue Aug 30, 2024 · 0 comments
Assignees
@marcpopMSFT
Labels
Area-Infrastructure untriaged Request triage from a team member

Comments

@dotnet-maestro-bot
Copy link
Contributor

Branch release/6.0.4xx in dotnet/sdk repo can't be mirrored from GitHub to Azure internal/release/6.0.4xx 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.
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Aug 30, 2024
@marcpopMSFT marcpopMSFT self-assigned this Sep 3, 2024
dotnet-bot pushed a commit that referenced this issue Oct 8, 2024
@marcpopMSFT
Merged PR 42558: Merge public release/6.0.4xx to internal/release/6.0…
2111278 
….4xx

#43112

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and script updates.

#### PR Summary
This pull request merges changes from the public release branch to the internal release branch, focusing on script updates and cleanup.
- Added `nuget-verification.ps1` to verify Microsoft NuGet packages.
- Removed `post-build-utils.ps1`, `trigger-subscriptions.ps1`, and `add-build-to-channel.ps1` scripts.
- Updated `publish-build-assets.yml` and `setup-maestro-vars.yml` to use `AzureCLI@2` instead of `PowerShell@2`.
- Updated dependencies in `Version.Details.xml` to newer versions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@marcpopMSFT marcpopMSFT

Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@marcpopMSFT @dotnet-maestro-bot