-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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/7.0' => 'release/7.0-staging' #95162
[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #95162
Conversation
…16.2 (dotnet#94871) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.15 -> To Version 7.0.15 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
[manual] Merge release/7.0-staging into release/7.0
Tagging subscribers to this area: @dotnet/area-infrastructure-libraries Issue DetailsI detected changes in the release/7.0 branch which have not been merged yet to release/7.0-staging. I'm a robot and am configured to help you automatically keep release/7.0-staging up to date, so I've opened this PR. This PR merges commits made on release/7.0 by the following committers:
Instructions for merging from UIThis 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. If this repo does not allow creating merge commits from the GitHub UI, use command line instructions. Instructions for merging via command lineRun these commands to merge this pull request from the command line. git fetch
git checkout release/7.0
git pull --ff-only
git checkout release/7.0-staging
git pull --ff-only
git merge --no-ff release/7.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-maestro-bot/runtime HEAD:merge/release/7.0-to-release/7.0-staging or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflictsInstructions for updating this pull requestContributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0-to-release/7.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
|
[manual] Merge release/7.0-staging into release/7.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merge commit
c43ad87
into
dotnet:release/7.0-staging
I detected changes in the release/7.0 branch which have not been merged yet to release/7.0-staging. I'm a robot and am configured to help you automatically keep release/7.0-staging up to date, so I've opened this PR.
This PR merges commits made on release/7.0 by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/7.0-to-release/7.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.