• ranzispa@mander.xyz
    link
    fedilink
    arrow-up
    0
    ·
    4 days ago

    Sometimes you really don’t want to look over the commit history of your colleagues. As long as it’s a small feature, a single commit is a pretty good option.

    Rather than:

    • implemented X
    • forgot this
    • oh, this was not needed
    • now tests actually pass
    • oops
    • fixed this
    • should be ready
    • expr@piefed.social
      link
      fedilink
      English
      arrow-up
      0
      ·
      4 days ago

      It’s fine if the changes belong in a single commit. Otherwise, an interactive rebase to craft a clean, quality history before merging is much, much better.

    • Elvith Ma'for@feddit.org
      link
      fedilink
      arrow-up
      0
      ·
      4 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
        link
        fedilink
        arrow-up
        0
        ·
        4 days ago

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

        • ranzispa@mander.xyz
          link
          fedilink
          arrow-up
          0
          ·
          4 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.