GitHub is currently merging PRs in the UI with the wrong merge method(github.com)

34 pointsby darknavianno scorso10 comments

GitHub is currently merging PRs in the UI with the wrong merge method

https://github.com/orgs/community/discussions/153620

11 comments

c8ganno scorso

Is this code written by GitHub employees? No wonder why so many down time with GitHub. Countless inconsistencies in this small piece of code

crtasmanno scorso

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?

thangngoc89anno scorso

Sure. Download the branch and use git.

   git checkout main
   git merge --squash pr_branch
   git commit -m "Commit message"

matharminanno scorso

This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo

rurbananno scorso

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

chrismcbanno scorso

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.

rurbananno scorso

Didn't know that Google is for dummies. Matches my interview experience there

thangngoc89anno scorso

Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me.

jupedanno scorso

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?

[deleted]anno scorso

darknavianno scorso

I thought I was going crazy before finding this bug. Hit this a few times this evening, very annoying.