I detected changes in the release/6.0.4xx branch which have not been merged yet to release/8.0.1xx. I'm a robot and am configured to help you automatically keep release/8.0.1xx up to date, so I've opened this PR.
This PR merges commits made on release/6.0.4xx by the following committers:
joeloff
vseanreesermsft
dotnet-maestro[bot]
marcpopMSFT
dotnet-bot
MiYanni
v-wuzhai
JL03-Yue
MilenaHristova
invalid-email-address
mmitche
dkurepa
wtgodbe
YuliiaKovalova
vlada-shubina
JanKrivanek
bekir-ozturk
DavidKarlas
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.
git fetch
git checkout release/6.0.4xx
git pull --ff-only
git checkout release/8.0.1xx
git pull --ff-only
git merge --no-ff release/6.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/6.0.4xx-to-release/8.0.1xx
or if you are using SSH
```
git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
```
After PR checks are complete push the branch
git push
Instructions for resolving conflicts
:warning: 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.4xx-to-release/8.0.1xx'. 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
```
git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx
git pull git@github.com:dotnet-maestro-bot/templating-1 merge/release/6.0.4xx-to-release/8.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx
```
I detected changes in the release/6.0.4xx branch which have not been merged yet to release/8.0.1xx. I'm a robot and am configured to help you automatically keep release/8.0.1xx up to date, so I've opened this PR.
This PR merges commits made on release/6.0.4xx 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
``` git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx ```After PR checks are complete push the branch
Instructions for resolving conflicts
:warning: 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.4xx-to-release/8.0.1xx'. 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
``` git checkout -b merge/release/6.0.4xx-to-release/8.0.1xx release/8.0.1xx git pull git@github.com:dotnet-maestro-bot/templating-1 merge/release/6.0.4xx-to-release/8.0.1xx (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet-maestro-bot/templating-1 HEAD:merge/release/6.0.4xx-to-release/8.0.1xx ```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.