Skip to content

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx'#20893

Merged
nagilson merged 2 commits into
release/8.0.4xxfrom
merge/release/8.0.1xx-to-release/8.0.4xx
Jun 16, 2026
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx'#20893
nagilson merged 2 commits into
release/8.0.4xxfrom
merge/release/8.0.1xx-to-release/8.0.4xx

Conversation

@github-actions

Copy link
Copy Markdown

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:

  • ellahathaway

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.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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
or if you are using SSH
git push git@github.com:dotnet/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

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.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/installer 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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx
or if you are using SSH
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/installer 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/installer HEAD:merge/release/8.0.1xx-to-release/8.0.4xx

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.

@SimonZhao888

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Resolve modify/delete conflict for eng/pipelines/vmr-build-pr.yml:
Keep deletion from release/8.0.4xx as the file is specific to 8.0.1xx
(references release/8.0.1xx branch and was excluded from previous merges).

Copilot AI commented Jun 16, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict. There was one modify/delete conflict for eng/pipelines/vmr-build-pr.yml — the file was modified in release/8.0.1xx (endpoint changed from dotnet to public) but not present in release/8.0.4xx. Kept the deletion consistent with how previous merges handled this file (it references release/8.0.1xx branch and was intentionally excluded from 8.0.4xx).

The branch now contains a proper merge commit (7c09cb4) with both release/8.0.4xx and release/8.0.1xx as parents.

@nagilson nagilson merged commit 7e90008 into release/8.0.4xx Jun 16, 2026
14 checks passed
@nagilson nagilson deleted the merge/release/8.0.1xx-to-release/8.0.4xx branch June 16, 2026 17:15
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.

4 participants