Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • dibarbet

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

# 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/release-to-main
or if you are using SSH
git push [email protected]:dotnet/vscode-csharp HEAD:merge/release-to-main

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

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.

@github-actions github-actions bot requested a review from a team as a code owner March 31, 2025 19:03
Copy link
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

Bret Johnson and others added 8 commits March 31, 2025 17:12
Revert xamlTools to what it was 2 weeks ago, to avoid the problem in
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2429317,
with references to the wrong version of Microsoft.VisualStudio.Threading.

A proper fix will go to main, but for this week's prerelease update we're
just reverting to the xamlTools version currently shipping in prerelease.
There aren't any important fixes getting missed, so revert isn't a problem.
@dotnet-policy-service dotnet-policy-service bot merged commit 503d76a into main Apr 5, 2025
25 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/release-to-main branch April 5, 2025 00:54
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.

1 participant