• Elvith Ma'for@feddit.org
    15·
    3 days ago

    That’s basically my commit history for every repo where I need the pipeline to run to see if everything works.

    • kungen@feddit.nu
      5·
      3 days ago

      Haha same. But that’s why you do it in another branch, and then squash-merge.

      • ranzispa@mander.xyz
        2·
        3 days ago

        I like squash merge on small changes, but when larger code changes are there it becomes a huge commit which is difficult to review if you ever have to go back.

        • psycotica0@lemmy.ca
          1·
          3 days ago

          Right… for sure… but then if you don’t want to squash, then it doesn’t matter you can’t squash a merge commit.

    • ranzispa@mander.xyz
      1·
      3 days ago

      When I do that I always have a Dev branch that I use as the production branch to run the actual calculations.

      When I get something working I merge it off, clean up the history a little bit, rebase main onto it and then rebase de onto main.