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

openssh: update to 9.9p2 #27712

Merged
merged 1 commit into from
Feb 19, 2025
Merged

Conversation

artkiver
Copy link
Contributor

Description

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 15.3.1 24D70 arm64
Command Line Tools 16.2.0.0.1.1733547573

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

@artkiver
Copy link
Contributor Author

This looked as if it was all green earlier, but when refreshing the PR I now see this:

"Merging is blocked
Merge is not an allowed merge method in this repository.
This branch must not contain merge commits."

What is causing that and how should it be rectified? The message is not particularly descriptive and I have never encountered it previously.

@artkiver
Copy link
Contributor Author

artkiver commented Feb 19, 2025

This looked as if it was all green earlier, but when refreshing the PR I now see this:

"Merging is blocked Merge is not an allowed merge method in this repository. This branch must not contain merge commits."

What is causing that and how should it be rectified? The message is not particularly descriptive and I have never encountered it previously.

Perhaps it has something to do with "Try the new merge experience"?

Instead clicking the "Switch back to the classic merge experience" removed that error.

I am so confused. wtfh GitHub.

Screenshots attached for reference in case others may be able to provide more insight into that unexpected ordeal.

Screenshot 2025-02-19 at 04 30 21
Screenshot 2025-02-19 at 04 30 11

@tobypeterson
Copy link
Contributor

I don't know, I don't see that with either classic or new.

@tobypeterson tobypeterson merged commit 77ed210 into macports:master Feb 19, 2025
3 checks passed
@artkiver artkiver deleted the openss9.9p2_uno branch February 19, 2025 13:33
@artkiver
Copy link
Contributor Author

I don't know, I don't see that with either classic or new.

Thanks for checking and thank you for the merge as well!

Regarding the merge stuff, it's weird. at least on my end, everything looked all green, but then I refreshed my browser to see if anyone had merged the PR when I saw the red indicators which I shared in the screen shot.

After clicking the "Switch back to the classic merge experience" everything was all green again, but I have no recollection of ever having changed that merge methodology previously either.

I could recreate the red icon status after clicking "Try the new merge experience" as well.

I'm going to chalk it up to ¯_(ツ)_/¯ GitHub; but maybe there are some gremlins in my browser?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants