• Zangoose@lemmy.one
    link
    fedilink
    arrow-up
    3
    arrow-down
    1
    ·
    8 months ago

    I feel like squash and merge on GitHub/GitLab is nicer for that anyway though, it makes the main branch so much cleaner automatically

    • dejected_warp_core@lemmy.world
      link
      fedilink
      arrow-up
      1
      ·
      8 months ago

      If you’re using “trunk-based development” (everything is a PR branch or in main), this works great.

      If you’re using GitFlow, it can make PRs between the major prod/dev/staging branches super messy. It would be nice if GitHub would let you define which merge strategies are allowed per-branch, but that’s not a thing (AFAIK). So you’re probably better off not squashing in this situation.