Yeah learned this the hard way.

  • hayvan@feddit.nl
    link
    fedilink
    arrow-up
    2
    ·
    2 days ago

    Yeah, I hate it when my repo is a chain of merge commits. I want to see actual changes to the code, not branch management history.

    • Mr. Satan@lemmy.zip
      link
      fedilink
      arrow-up
      2
      ·
      1 day ago

      I’m the opposite. I just let git take care of the stupid content. Why mess with the commit graph? Merging locally (instead of squashing) works better with merge requests because the graph clearly shows what changes went where.

      I do some branch maintenance on my local branch (rebasing) until there are conflicts, but other than that I don’t see any benefit for messing with commit history.