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/8.0.4xx' => 'main' #8096

Merged

Conversation

dotnet-maestro-bot
Copy link

I detected changes in the release/8.0.4xx 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/8.0.4xx by the following committers:

  • dotnet-maestro[bot]
  • v-wuzhai

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/8.0.4xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/8.0.4xx

# 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/templating-1 HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.4xx-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/8.0.4xx-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/8.0.4xx-to-main main
git pull https://github.com/dotnet-maestro-bot/templating-1 merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.4xx-to-main
or if you are using SSH
git checkout -b merge/release/8.0.4xx-to-main main
git pull [email protected]:dotnet-maestro-bot/templating-1 merge/release/8.0.4xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/templating-1 HEAD:merge/release/8.0.4xx-to-main

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.

dotnet-maestro bot and others added 5 commits May 17, 2024 08:21
[release/8.0.4xx] Update dependencies from dotnet/arcade


 - Remove redundant equality

 - Remove unused parameter

 - Remove unused parameter
…516.3 (dotnet#7986)

[release/8.0.4xx] Update dependencies from dotnet/arcade
…520.4

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24270.4
…ba5-2df6-4186-8c15-dfb061cca619

[release/8.0.4xx] Update dependencies from dotnet/arcade
…610.5 (dotnet#8093)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.24270.4 -> To Version 8.0.0-beta.24310.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro-bot dotnet-maestro-bot force-pushed the merge/release/8.0.4xx-to-main branch from c2af27b to cea63a6 Compare June 11, 2024 22:59
@dotnet-maestro-bot dotnet-maestro-bot requested a review from a team as a code owner June 11, 2024 22:59
@v-wuzhai v-wuzhai force-pushed the merge/release/8.0.4xx-to-main branch from 3b7e7ff to 4ee5f23 Compare June 12, 2024 02:36
@ViktorHofer ViktorHofer enabled auto-merge June 12, 2024 07:57
@ViktorHofer ViktorHofer merged commit bad903e into dotnet:main Jun 12, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants