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-rc1' => 'release/9.0' #107214

Closed

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • lewing

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-rc1
git pull --ff-only
git checkout release/9.0
git pull --ff-only
git merge --no-ff release/9.0-rc1

# 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/runtime HEAD:merge/release/9.0-rc1-to-release/9.0
or if you are using SSH
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-rc1-to-release/9.0

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-rc1-to-release/9.0'. 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-rc1-to-release/9.0 release/9.0
git pull https://github.com/dotnet/runtime merge/release/9.0-rc1-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/9.0-rc1-to-release/9.0
or if you are using SSH
git checkout -b merge/release/9.0-rc1-to-release/9.0 release/9.0
git pull git@github.com:dotnet/runtime merge/release/9.0-rc1-to-release/9.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/9.0-rc1-to-release/9.0

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.

Copy link
Contributor

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

…30.3 (#107216)

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport
 From Version 9.0.0-rc.1.24420.5 -> To Version 9.0.0-rc.1.24430.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop carlossanlop removed the Servicing-approved Approved for servicing release label Sep 4, 2024
@carlossanlop carlossanlop self-requested a review September 4, 2024 17:07
@carlossanlop
Copy link
Member

This is stale already. The base release/9.0 branch has newer stuff now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-codeflow for labeling automated codeflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants