Skip to content

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

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

  • alexperovich

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

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

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.

@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Merge Forward ⏩ labels Sep 1, 2022
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Sep 1, 2022
@ghost
Copy link

ghost commented Sep 1, 2022

Thanks for your PR, @dotnet-maestro-bot. Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

@halter73
Copy link
Member

halter73 commented Sep 2, 2022

@alexperovich @dotnet/aspnet-build We want to keep using the NetCore-Svc-Public pools in release/7.0, right? I'm making sure because that's how I resolved the merge conflict. 6573350 (#43674)

@alexperovich
Copy link
Member

yep, release branches should keep using svc pools.

@halter73 halter73 merged commit d34e667 into dotnet:release/7.0 Sep 2, 2022
@mkArtakMSFT mkArtakMSFT removed the community-contribution Indicates that the PR has been added by a community member label Sep 18, 2022
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 Type: Merge Forward ⏩

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants