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

minor fix: fix comment that incorrectly says "google.com" instead of "rust-lang.org" #1667

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

minneelyyyy
Copy link
Contributor

No description provided.

Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@cpu
Copy link
Member

cpu commented Dec 5, 2023

Would you mind squashing your two commits into one?

Copy link

codecov bot commented Dec 5, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6845c01) 95.90% compared to head (5d47a74) 95.90%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1667   +/-   ##
=======================================
  Coverage   95.90%   95.90%           
=======================================
  Files          78       78           
  Lines       16083    16083           
=======================================
  Hits        15424    15424           
  Misses        659      659           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cpu
Copy link
Member

cpu commented Dec 5, 2023

Unfortunately I don't seem to be able to push to the origin branch on the fork to do the squashing on your behalf (perhaps because it's main and not a feature branch?):

To github.com:girlbuzz/rustls.git
 ! [remote rejected]   girlbuzz/main -> girlbuzz/main (permission denied)
error: failed to push some refs to 'github.com:girlbuzz/rustls.git'

I propose we use administrative merge to bypass the merge queue to allow using "Squash and merge" - alternatively I could open a new PR that cherry-picks the commits and tidies up.

@cpu cpu merged commit e051f5c into rustls:main Dec 5, 2023
23 checks passed
@cpu
Copy link
Member

cpu commented Dec 5, 2023

I propose we use administrative merge to bypass the merge queue to allow using "Squash and merge"

Done.

Thanks again for the fix.

@minneelyyyy
Copy link
Contributor Author

apologies for not squashing it myself, I just wasn't on Github actively.

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