GitHub is currently merging PRs in the UI with the wrong merge method github.com 33 points by darknavi 20 hours ago
darknavi 20 hours ago I thought I was going crazy before finding this bug. Hit this a few times this evening, very annoying.
c8g 15 hours ago Is this code written by GitHub employees? No wonder why so many down time with GitHub. Countless inconsistencies in this small piece of code
crtasm 19 hours ago 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? thangngoc89 19 hours ago Sure. Download the branch and use git. git checkout main git merge --squash pr_branch git commit -m "Commit message" matharmin 19 hours ago This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo thangngoc89 19 hours ago Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me. rurban 18 hours ago 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
thangngoc89 19 hours ago Sure. Download the branch and use git. git checkout main git merge --squash pr_branch git commit -m "Commit message" matharmin 19 hours ago This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo thangngoc89 19 hours ago Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me. rurban 18 hours ago 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
matharmin 19 hours ago This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo thangngoc89 19 hours ago Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me. rurban 18 hours ago 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
thangngoc89 19 hours ago Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me.
rurban 18 hours ago 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
juped 18 hours ago 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?
I thought I was going crazy before finding this bug. Hit this a few times this evening, very annoying.
Is this code written by GitHub employees? No wonder why so many down time with GitHub. Countless inconsistencies in this small piece of code
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?
Sure. Download the branch and use git.
This doesn't work if you have branch protection rules blocking pushes to main, which in my opinion should be standard on any repo
Oh I forgot about that. I mostly work on private repo (free account) so that feature isn't available to me.
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
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?