Skip to content

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' - #56101

Open
github-actions[bot] wants to merge 4 commits into
release/10.0.1xxfrom
merge/release/9.0.3xx-to-release/10.0.1xx
Open

[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx'#56101
github-actions[bot] wants to merge 4 commits into
release/10.0.1xxfrom
merge/release/9.0.3xx-to-release/10.0.1xx

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

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

This PR merges commits made on release/9.0.3xx by the following committers:

  • vseanreesermsft

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/9.0.3xx
git pull --ff-only
git checkout release/10.0.1xx
git pull --ff-only
git merge --no-ff release/9.0.3xx

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

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/9.0.3xx-to-release/10.0.1xx'. 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/9.0.3xx-to-release/10.0.1xx origin/release/10.0.1xx
git pull https://github.com/dotnet/sdk merge/release/9.0.3xx-to-release/10.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.3xx-to-release/10.0.1xx
or if you are using SSH
git fetch
git checkout -b merge/release/9.0.3xx-to-release/10.0.1xx origin/release/10.0.1xx
git pull git@github.com:dotnet/sdk merge/release/9.0.3xx-to-release/10.0.1xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.3xx-to-release/10.0.1xx

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.

vseanreesermsft and others added 2 commits September 2, 2026 12:39
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
- src/SourceBuild/*
@mthalman

mthalman commented Sep 3, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

@mthalman

mthalman commented Sep 3, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

…ease/9.0.3xx-to-release/10.0.1xx

# Conflicts:
#	NuGet.config
#	eng/Version.Details.props
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json

Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com>

Copilot AI commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in 260361a9d20. The merge commit retains both parents and the resulting tree matches the latest release/10.0.1xx; PR checks are now running.

Copilot AI commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

The conflicts are resolved in 260361a9d20. I refreshed both refs and verified that e89b799 is contained in the merge commit and that their trees match exactly. The PR is currently blocked only on in-progress checks/review, not merge conflicts.

@nagilson
nagilson enabled auto-merge September 8, 2026 20:10
@nagilson
nagilson disabled auto-merge September 8, 2026 20:10
@nagilson
nagilson requested a review from a team September 8, 2026 20:10
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