• snoweM
    link
    fedilink
    56 months ago

    That’s why for typical project it is useful to merge pull requests into the main branch — the linear sequence of merge commits is a record of successful CI runs, and is a set of commits you want to git bisect over.

    … if you do this you completely negate your ability to use git bisect…

    • @Fal
      link
      fedilink
      English
      26 months ago

      Squash fast forward merge is the only way

    • @[email protected]
      link
      fedilink
      26 months ago

      Quite the opposite. If you fast forward merge without squashing, you lose the ability to meaningfully bisect, since only the head of each merge is checked by CI - other commits may not even build

      • snoweM
        link
        fedilink
        16 months ago

        My point was about merging in general. Unless you’re either

        1. Making sure every single commit builds
        2. Squashing and merging, with no merge commit

        Then you’re not going to be able to effectively use git bisect.