807
Well well well. (lemmy.ml)
submitted 1 year ago by to c/programmer_humor@programming.dev
130 comments fedilink hide all child comments
 

Yeah learned this the hard way.

you are viewing a single comment's thread
view the rest of the comments
[–] 3 points 1 year ago (1 child)

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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 1 child comment
    •
  • [–] 2 points 1 year 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.

  • permalink
  • fedilink
  • source
  • parent