Skip to content

[automated] Merge branch 'release/7.0-rc1-publicPoolNames' => 'release/7.0' #74901

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

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/runtime HEAD:merge/release/7.0-rc1-publicPoolNames-to-release/7.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/runtime 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/runtime 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/runtime 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 git@github.com:dotnet-maestro-bot/runtime merge/release/7.0-rc1-publicPoolNames-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/runtime 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
Copy link

ghost commented Sep 1, 2022

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

Issue Details

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

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

@carlossanlop
Copy link
Contributor

Reminder to use "merge commit" on this one.

@ViktorHofer
Copy link
Member

This isn't a branch that we want to merge into release/7.0. The fix that this branch is bringing in will be flowing into release/7.0 as #74906 is already merged into release/7.0-rc1.

@ViktorHofer ViktorHofer closed this Sep 1, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Oct 1, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants