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

Revert "Merge branch 'net7.0' into main" #3531

Merged
merged 1 commit into from
Aug 3, 2022

Conversation

alanwest
Copy link
Member

@alanwest alanwest commented Aug 3, 2022

This reverts commit e64015c, reversing
changes made to 5653454.

The net7.0 branch was unintentionally merged to main. 😲

I pushed the "Update branch" button on #3528 and this resulted in updating main. This was probably only possible because I have admin rights on the repo. Though, I believe there are branch protection rules that prevent even admins from doing this. I will investigate...

For reference, this is what I ran to back out the changes.

git revert -m 1 e64015cadda2dcc6c7a86bbb61299be52ffa346d

This reverts commit e64015c, reversing
changes made to 5653454.
@alanwest alanwest requested a review from a team August 3, 2022 22:33
@reyang
Copy link
Member

reyang commented Aug 3, 2022

Or maybe use the maintainer power to checkout the previous commit and do a force push?

@alanwest
Copy link
Member Author

alanwest commented Aug 3, 2022

Or maybe use the maintainer power to checkout the previous commit and do a force push?

A force push was my initial thought as well, though figured this was the safest route in case anyone had pulled from main.

@alanwest alanwest merged commit 25df7e8 into main Aug 3, 2022
@alanwest alanwest deleted the alanwest/revert-net7.0-merge branch August 3, 2022 22:47
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.

3 participants