Commit f7df768
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx' (#9797)
I detected changes in the release/8.0.1xx branch which have not been
merged yet to release/8.0.4xx. I'm a robot and am configured to help you
automatically keep release/8.0.4xx up to date, so I've opened this PR.
This PR merges commits made on release/8.0.1xx by the following
committers:
* marcpopMSFT
* vseanreesermsft
* DonnaChen888
* 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.
<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />
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.
``` sh
git fetch
git checkout release/8.0.1xx
git pull --ff-only
git checkout release/8.0.4xx
git pull --ff-only
git merge --no-ff release/8.0.1xx
# 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/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
```
<details>
<summary>or if you are using SSH</summary>
```
git push git@github.com:dotnet/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
```
</details>
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][resolve-github]
or using the [command line][resolve-cli].
[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-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.1xx-to-release/8.0.4xx'. This
can be done to resolve conflicts or make other changes to this pull
request before it is merged.
The provided examples assume that the remote is named 'origin'. If you
have a different remote name, please replace 'origin' with the name of
your remote.
```
git fetch
git checkout -b merge/release/8.0.1xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull https://github.com/dotnet/templating merge/release/8.0.1xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
```
<details>
<summary>or if you are using SSH</summary>
```
git fetch
git checkout -b merge/release/8.0.1xx-to-release/8.0.4xx origin/release/8.0.4xx
git pull git@github.com:dotnet/templating merge/release/8.0.1xx-to-release/8.0.4xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/templating HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
```
</details>
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.File tree
0 file changed
+0
-0
lines changed0 file changed
+0
-0
lines changed
0 commit comments