Skip to content

Fix merge prerelease branch update #8774

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 12, 2025
Merged

Fix merge prerelease branch update #8774

merged 1 commit into from
Nov 12, 2025

Conversation

@dibarbet
Copy link
Member

@dibarbet dibarbet commented Nov 12, 2025

The prerelease branch snap failed for two reasons

  1. bug in the create pull request action which failed the task
  2. the create pull request action does not behave as we desire for update. It resets the branch to the remote base branch and commits the unstaged changes on top (deleting all of the merge changes).

instead just push the changes to the branch.
tested https://github.com/dibarbet/vscode-csharp/actions/runs/19309923461/job/55227638944

@dibarbet dibarbet requested a review from a team as a code owner November 12, 2025 20:00
@dibarbet dibarbet merged commit cacdfc6 into dotnet:main Nov 12, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akhera99 akhera99 akhera99 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dibarbet @akhera99