Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

+1 "Never merge with GitHub... I don’t feel that I have the proper control"


Me neither, not since I got bitten by the 'Resolve Conflicts' button on the PR page also merging the PR into the target branch.

Maybe it's PEBCAC, and to be fair it is documented[0], but the big red warning in the docs is missing from the page where you actually do the action. To make it more confusing there's also a disabled 'Merge pull request' button that implies that resolving the conflicts and merging the PR are separate actions

0: https://docs.github.com/en/free-pro-team@latest/github/colla...




Consider applying for YC's Summer 2026 batch! Applications are open till May 4

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: