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/6.0' => 'release/6.0-staging' #106341

Merged

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • carlossanlop
  • dotnet-maestro[bot]

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/6.0
git pull --ff-only
git checkout release/6.0-staging
git pull --ff-only
git merge --no-ff release/6.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/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH
git push git@github.com:dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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/6.0-to-release/6.0-staging'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull https://github.com/dotnet/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging
or if you are using SSH
git checkout -b merge/release/6.0-to-release/6.0-staging release/6.0-staging
git pull git@github.com:dotnet/runtime merge/release/6.0-to-release/6.0-staging
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/runtime HEAD:merge/release/6.0-to-release/6.0-staging

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.

Mirroring and others added 9 commits July 2, 2024 20:56
* Update dependencies from https://github.com/dotnet/emsdk build 20240722.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.33 -> To Version 6.0.33

* Update dependencies from https://github.com/dotnet/emsdk build 20240729.2

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.33 -> To Version 6.0.33

* Update dependencies from https://github.com/dotnet/emsdk build 20240806.1

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.33 -> To Version 6.0.34

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
[manual] Merge release/6.0-staging into release/6.0
@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow label Aug 13, 2024
vseanreesermsft and others added 2 commits August 13, 2024 11:00
…-merge-6.0-2024-08-13-1100-2f106de6-1a71-445d-827e-4b0e022ba5d1
…24-08-13-1100-2f106de6-1a71-445d-827e-4b0e022ba5d1

Merging internal commits for release/6.0
@carlossanlop carlossanlop merged commit 26c2e13 into release/6.0-staging Sep 4, 2024
242 of 269 checks passed
@carlossanlop carlossanlop deleted the merge/release/6.0-to-release/6.0-staging branch September 4, 2024 21:43
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 Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants