1222
A classic (sopuli.xyz)
submitted 2 years ago by to c/programmerhumor@lemmy.ml
37 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 2 points 2 years ago (1 child)

merge commits that catch my feature branches up to main

You'd be squashing those when you merge back down into main anyway, no?

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 2 child comments
    •
  • [–] 2 points 2 years ago

    You'd hope so - and if one does, I have no concerns about whatever one chooses to do in the privacy of their own branch - but some people insist on directly merging to main (preserving two parallel histories), rather than squashing their change into a single commit. Savages ;)

  • permalink
  • fedilink
  • source
  • parent