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.

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

[automated] Merge branch 'release/9.0' => 'main' #57339

Merged
merged 4 commits into from
Aug 19, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/9.0 by the following committers:

  • wtgodbe

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0-to-main main
git pull https://github.com/dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/aspnetcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git checkout -b merge/release/9.0-to-main main
git pull [email protected]:dotnet/aspnetcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/aspnetcore HEAD:merge/release/9.0-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

@github-actions github-actions bot requested review from wtgodbe and a team as code owners August 14, 2024 23:58
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Aug 14, 2024
@amcasey
Copy link
Member

amcasey commented Aug 16, 2024

This looks correct to me, but I'm not familiar with this part of our infrastructure. @wtgodbe?

@wtgodbe
Copy link
Member

wtgodbe commented Aug 19, 2024

These are changes we don't actually want in main, I'll fix up the PR

@wtgodbe
Copy link
Member

wtgodbe commented Aug 19, 2024

No-op merge, bypassing CI

@wtgodbe wtgodbe merged commit 987dbfb into main Aug 19, 2024
4 of 26 checks passed
@wtgodbe wtgodbe deleted the merge/release/9.0-to-main branch August 19, 2024 15:48
@dotnet-policy-service dotnet-policy-service bot added this to the 10.0-preview1 milestone Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants