Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release' => 'main' #7761

Merged
merged 11 commits into from
Nov 12, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 9, 2024

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
  • ryzngard
  • WardenGnaw

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 git@github.com: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.

git checkout -b merge/release-to-main 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 checkout -b merge/release-to-main main
git pull git@github.com:dotnet/vscode-csharp merge/release-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com: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.

WardenGnaw and others added 10 commits November 8, 2024 01:06

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update Debugger Packages for v2.55.0

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Patch prerelease roslyn version

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Update razor to 9.0.0-preview.24557.10

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
[automated] Merge branch 'prerelease' => 'release'
@github-actions github-actions bot requested a review from a team as a code owner November 9, 2024 00:25

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
@dibarbet dibarbet enabled auto-merge November 11, 2024 23:55
@dibarbet dibarbet merged commit abb26cd into main Nov 12, 2024
16 checks passed
@dibarbet dibarbet deleted the merge/release-to-main branch November 12, 2024 00:37
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.

None yet

3 participants