Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

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:

  • ryzngard
  • dibarbet
  • kunyli
  • JoeRobich
  • WardenGnaw
  • dotnet-bot
  • akhera99
  • etvorun
  • genlu

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 [email protected]: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 [email protected]:dotnet/vscode-csharp merge/prerelease-to-release
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]: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.

genlu and others added 30 commits November 19, 2024 17:18
JoeRobich and others added 24 commits December 16, 2024 17:13
Sets it so that if a user does not have fuse set in their configuration then the hot reload setting is used
With #7805 we switched to using vscode loglevels and LogOutputWindow which regressed the check for loglevel in report an issue.

As it turns out Off=0, which is less than Debug=2

Fixes devdiv.visualstudio.com/DevDiv/_workitems/edit/2331879?view=edit
@github-actions github-actions bot requested review from a team as code owners January 11, 2025 00:12
@dibarbet dibarbet enabled auto-merge January 11, 2025 00:13
@dibarbet dibarbet merged commit 59c9c25 into release Jan 11, 2025
19 checks passed
@dibarbet dibarbet deleted the merge/prerelease-to-release branch January 11, 2025 01:00
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.

8 participants