• GigglyBobble@kbin.social
    link
    fedilink
    arrow-up
    14
    ·
    1 year ago

    Merge commits suck.

    My biggest issue with GitHub is that it always squashes and merges.

    You are aware you’re talking about two different pieces of software?

    • dukk@programming.dev
      link
      fedilink
      arrow-up
      3
      ·
      1 year ago

      Yeah, I am. However GitHub, being the biggest Git hosting provider and all that, makes you use merge commits. FF-merges must be done manually from the command line. While this definitely isn’t a problem for me, many people out there just don’t care and merge without a second thought (which, as I said in my comment, results in having to create a new branch and cherry picking the commits onto there).

      • themusicman@lemmy.world
        link
        fedilink
        arrow-up
        5
        ·
        1 year ago

        You should check out the repo options on GitHub. It most definitely supports rebase merges, and you can disable other merge types if desired.