from Hacker News

Tell HN: Linear history is broken when using GitHub PRs

by spir on 10/31/23, 8:36 PM with 2 comments

Have you ever noticed how GitHub has no fast-forward pull request merges?

Did you know it's impossible to use GitHub PRs without rebasing your dev branch on main after every merged PR?

Please, if anybody knows somebody at GitHub that can help address this glaring limitation (15 years into GitHub's life), please help. My linear history people and I are desperate.

  • by akerl_ on 10/31/23, 8:42 PM

    It doesn't sound like your problem is linear history, so much as it's "having multiple long-lived branches".

    But also, you should be fine as long as you use merge commits. The thing that will mess up your history is if you let it rebase commits, since then you'll end up with diverged history.

    https://docs.github.com/en/pull-requests/collaborating-with-...