Skip to content

[automated] Merge branch 'prerelease' => 'release'#9280

Merged
dotnet-policy-service[bot] merged 231 commits intoreleasefrom
merge/prerelease-to-release
May 6, 2026
Merged

[automated] Merge branch 'prerelease' => 'release'#9280
dotnet-policy-service[bot] merged 231 commits intoreleasefrom
merge/prerelease-to-release

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented May 6, 2026

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

This PR merges commits made on prerelease by the following committers:

  • JoeRobich
  • invalid-email-address
  • dotnet-policy-service[bot]
  • dotnet-bot
  • WardenGnaw
  • dibarbet
  • noiseonwires
  • RikkiGibson
  • davidwengier
  • siramvikram
  • dependabot[bot]
  • thaystg
  • Copilot
  • JakeRadMSFT

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 prerelease
git pull --ff-only
git checkout release
git pull --ff-only
git merge --no-ff prerelease

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

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

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.

JoeRobich and others added 30 commits February 17, 2026 21:17
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions Bot requested review from a team as code owners May 6, 2026 17:03
@dotnet-policy-service dotnet-policy-service Bot enabled auto-merge May 6, 2026 17:05
Copy link
Copy Markdown
Contributor

@dotnet-policy-service dotnet-policy-service Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approve

@JoeRobich
Copy link
Copy Markdown
Member

Fixed merge conflicts in the Release snap.

cc: @RikkiGibson

@RikkiGibson
Copy link
Copy Markdown
Member

Going to adjust default value of the autoDiscovery setting in this PR.

@dotnet-policy-service dotnet-policy-service Bot merged commit 9d7a591 into release May 6, 2026
35 checks passed
@dotnet-policy-service dotnet-policy-service Bot deleted the merge/prerelease-to-release branch May 6, 2026 18:41
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.