News for hackers. Stuff that matters.
Re:GitHub is currently merging PRs in the UI with the wrong ... by darknavi on Tuesday March 11, 2025 @12:41AM (#43329204)
I thought I was going crazy before finding this bug. Hit this a few times this evening, very annoying.
Re:GitHub is currently merging PRs in the UI with the wrong ... by crtasm on Tuesday March 11, 2025 @01:38AM (#43329478)
This doesn't affect me but I am curious if it's possible to download the PR and use local tools for the desired merge?
Re:GitHub is currently merging PRs in the UI with the wrong ... by thangngoc89 on Tuesday March 11, 2025 @01:40AM (#43329490)
Sure. Download the branch and use git.

   git checkout main
   git merge --squash pr_branch
   git commit -m "Commit message"
Re:GitHub is currently merging PRs in the UI with the wrong ... by matharmin on Tuesday March 11, 2025 @01:42AM (#43329502)
This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo
Re:GitHub is currently merging PRs in the UI with the wrong ... by thangngoc89 on Tuesday March 11, 2025 @01:44AM (#43329518)
Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me.
Re:GitHub is currently merging PRs in the UI with the wrong ... by rurban on Tuesday March 11, 2025 @02:37AM (#43329768)
Nope. Pushing to main is only disallowed by default if you change history. A normal squash or rebase merge is allowed and should be allowed.

UI-only workflows are for dummies, they won't fly for larger projects

Re:GitHub is currently merging PRs in the UI with the wrong ... by chrismcb on Wednesday March 12, 2025 @12:21AM (#43339927)
Define large projects. While you can use the cli Google has ui only workflows. I'm fairly certain Google probably has the largest project out there.
Re:GitHub is currently merging PRs in the UI with the wrong ... by rurban on Wednesday March 12, 2025 @01:21AM (#43340195)
Didn't know that Google is for dummies. Matches my interview experience there
Re:GitHub is currently merging PRs in the UI with the wrong ... by juped on Tuesday March 11, 2025 @02:20AM (#43329689)
I tried to shoot myself in the foot but Github broke the gun and it hit a firing range target instead, how did this reach production?
Re:GitHub is currently merging PRs in the UI with the wrong ... by c8g on Tuesday March 11, 2025 @05:31AM (#43330724)
Is this code written by GitHub employees? No wonder why so many down time with GitHub. Countless inconsistencies in this small piece of code